diff options
author | Max Kellermann <max@duempel.org> | 2014-02-05 00:02:02 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2014-02-05 00:02:02 +0100 |
commit | e8938b1069739eca2bd2f27705c1c7783e834e59 (patch) | |
tree | 482330dbf228c12a60c9a401f0428cc4e292e234 /src/output/MultipleOutputs.cxx | |
parent | 4a283330394fd2e1541a03bd312e5fadf54aa055 (diff) |
MixerPlugin: add EventLoop& init() parameter
Diffstat (limited to 'src/output/MultipleOutputs.cxx')
-rw-r--r-- | src/output/MultipleOutputs.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/output/MultipleOutputs.cxx b/src/output/MultipleOutputs.cxx index 66390f24d..a65fb73c0 100644 --- a/src/output/MultipleOutputs.cxx +++ b/src/output/MultipleOutputs.cxx @@ -50,10 +50,10 @@ MultipleOutputs::~MultipleOutputs() } static AudioOutput * -LoadOutput(PlayerControl &pc, const config_param ¶m) +LoadOutput(EventLoop &event_loop, PlayerControl &pc, const config_param ¶m) { Error error; - AudioOutput *output = audio_output_new(param, pc, error); + AudioOutput *output = audio_output_new(event_loop, param, pc, error); if (output == nullptr) { if (param.line > 0) FormatFatalError("line %i: %s", @@ -67,12 +67,12 @@ LoadOutput(PlayerControl &pc, const config_param ¶m) } void -MultipleOutputs::Configure(PlayerControl &pc) +MultipleOutputs::Configure(EventLoop &event_loop, PlayerControl &pc) { const config_param *param = nullptr; while ((param = config_get_next_param(CONF_AUDIO_OUTPUT, param)) != nullptr) { - auto output = LoadOutput(pc, *param); + auto output = LoadOutput(event_loop, pc, *param); if (FindByName(output->name) != nullptr) FormatFatalError("output devices with identical " "names: %s", output->name); @@ -83,7 +83,7 @@ MultipleOutputs::Configure(PlayerControl &pc) if (outputs.empty()) { /* auto-detect device */ const config_param empty; - auto output = LoadOutput(pc, empty); + auto output = LoadOutput(event_loop, pc, empty); outputs.push_back(output); } } |