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

output/Internal: move "client" to struct AudioOutputControl

Browse Source
This commit is contained in:
Max Kellermann
2017-05-23 00:31:13 +02:00
parent 194f733ca7
commit ebecee3d85
7 changed files with 24 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/output/MultipleOutputs.cxx
View File

@@ -53,11 +53,10 @@ static AudioOutput *
LoadOutput(EventLoop &event_loop,
const ReplayGainConfig &replay_gain_config,
MixerListener &mixer_listener,
AudioOutputClient &client, const ConfigBlock &block)
const ConfigBlock &block)
try {
return audio_output_new(event_loop, replay_gain_config, block,
mixer_listener,
client);
mixer_listener);
} catch (const std::runtime_error &e) {
if (block.line > 0)
std::throw_with_nested(FormatRuntimeError("Failed to configure output in line %i",
@@ -74,8 +73,8 @@ LoadOutputControl(EventLoop &event_loop,
{
auto *output = LoadOutput(event_loop, replay_gain_config,
mixer_listener,
client, block);
auto *control = new AudioOutputControl(output);
block);
auto *control = new AudioOutputControl(output, client);
try {
control->Configure(block);