oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

mixer/Plugin: pass AudioOutput to init()

Browse Source 
Fix breakage from commit bea5681fd8
This commit is contained in:
Max Kellermann
2017-08-10 13:07:36 +02:00
parent fb0dbce15b
commit a257504ba4
13 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/output/Init.cxx
+6 -4
View File
@@ -118,19 +118,21 @@ audio_output_load_mixer(EventLoop &event_loop, FilteredAudioOutput &ao,
return nullptr;
case MixerType::NULL_:
return mixer_new(event_loop, null_mixer_plugin, ao, listener,
return mixer_new(event_loop, null_mixer_plugin,
*ao.output, listener,
block);
case MixerType::HARDWARE:
if (plugin == nullptr)
return nullptr;
return mixer_new(event_loop, *plugin, ao, listener,
return mixer_new(event_loop, *plugin,
*ao.output, listener,
block);
case MixerType::SOFTWARE:
mixer = mixer_new(event_loop, software_mixer_plugin, ao,
listener,
mixer = mixer_new(event_loop, software_mixer_plugin,
*ao.output, listener,
ConfigBlock());
assert(mixer != nullptr);