Merge branch 'v0.20.x' into master

contains OSX mixer
This commit is contained in:
Matthew Leon
2017-08-22 10:36:37 +01:00
7 changed files with 137 additions and 0 deletions

View File

@@ -1507,6 +1507,8 @@ liboutput_plugins_a_SOURCES += \
src/output/plugins/OSXOutputPlugin.cxx \
src/output/plugins/OSXOutputPlugin.hxx
endif
libmixer_plugins_a_SOURCES += \
src/mixer/plugins/OSXMixerPlugin.cxx
if ENABLE_PULSE
liboutput_plugins_a_SOURCES += \