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

output/Control: add method Configure()

Browse Source 
Prepare to move some configuration settings from AudioOutput to
AudioOutputControl.
This commit is contained in:
Max Kellermann 2017-05-22 23:36:45 +02:00
parent e5847f1ddf
commit 2e65686fc0
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/output/Control.cxx
View File

@ -44,6 +44,12 @@ AudioOutputControl::AudioOutputControl(AudioOutput *_output)
{
}
void
AudioOutputControl::Configure(const ConfigBlock &block)
{
(void)block;
}
const char *
AudioOutputControl::GetName() const
{

6
src/output/Control.hxx
View File

@ -38,6 +38,7 @@
enum class ReplayGainMode : uint8_t;
struct AudioOutput;
struct MusicChunk;
struct ConfigBlock;
class MusicPipe;
class Mutex;
class Mixer;
@ -158,6 +159,11 @@ public:
AudioOutputControl(const AudioOutputControl &) = delete;
AudioOutputControl &operator=(const AudioOutputControl &) = delete;
/**
* Throws #std::runtime_error on error.
*/
void Configure(const ConfigBlock &block);
gcc_pure
const char *GetName() const;

13
src/output/MultipleOutputs.cxx
View File

@ -75,7 +75,18 @@ LoadOutputControl(EventLoop &event_loop,
auto *output = LoadOutput(event_loop, replay_gain_config,
mixer_listener,
client, block);
return new AudioOutputControl(output);
auto *control = new AudioOutputControl(output);
try {
control->Configure(block);
} catch (...) {
control->BeginDestroy();
control->FinishDestroy();
delete control;
throw;
}
return control;
}
void