Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[audioengine] use OSS only on FreeBSD #10961

Merged
merged 1 commit into from Nov 20, 2016

Conversation

@AlwinEsch
Copy link
Member

commented Nov 19, 2016

This use OSS audio now only on FreeBSD

Description

This prevent also the compile fault related to #10670

Motivation and Context

Want to have compile working to continue work ;-)

@FernetMenta is this way OK?

Types of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the Code guidelines of this project
  • My change requires a change to the documentation, either Doxygen or wiki
  • I have updated the documentation accordingly
  • I have read the CONTRIBUTING document
  • I have added tests to cover my change
  • All new and existing tests passed
@FernetMenta

This comment has been minimized.

Copy link
Member

commented Nov 19, 2016

+1
I don't think oss fallback was ever used in an case.

@@ -35,11 +35,12 @@
#elif defined(TARGET_LINUX) || defined(TARGET_FREEBSD)
#if defined(HAS_ALSA)
#include "Sinks/AESinkALSA.h"
#else

This comment has been minimized.

Copy link
@AlwinEsch

AlwinEsch Nov 19, 2016

Author Member

OK to change the else to #elif defined(TARGET_FREEBSD) here and on other positions (to have OSS only on FreeBSD)?

If it becomes separated to a own #elif defined(TARGET_FREEBSD) must be the PulseAudio part inserted two times (also available on FreeBSD).

@AlwinEsch AlwinEsch force-pushed the AlwinEsch:prevent-oss branch from 1f9aa4f to d297b56 Nov 19, 2016
@AlwinEsch AlwinEsch changed the title [audioengine] don't use OSS if ALSA is present [audioengine] use OSS only on FreeBSD Nov 19, 2016
@AlwinEsch AlwinEsch force-pushed the AlwinEsch:prevent-oss branch from d297b56 to 525af3e Nov 19, 2016
@AlwinEsch

This comment has been minimized.

Copy link
Member Author

commented Nov 19, 2016

jenkins build this please

@AlwinEsch AlwinEsch merged commit 4cff8d9 into xbmc:master Nov 20, 2016
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
jenkins4kodi You did a great job. Have a cookie.
Details
@AlwinEsch AlwinEsch deleted the AlwinEsch:prevent-oss branch Nov 20, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.