From 0e28b5324266cfe10e953a36a43331f139879463 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 27 Dec 2014 18:56:08 +0100 Subject: output/pipe: merge Initialize() and Configure() --- src/output/plugins/PipeOutputPlugin.cxx | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/output') diff --git a/src/output/plugins/PipeOutputPlugin.cxx b/src/output/plugins/PipeOutputPlugin.cxx index 8a674d7aa..1be5340e8 100644 --- a/src/output/plugins/PipeOutputPlugin.cxx +++ b/src/output/plugins/PipeOutputPlugin.cxx @@ -37,11 +37,8 @@ struct PipeOutput { PipeOutput() :base(pipe_output_plugin) {} - bool Initialize(const config_param ¶m, Error &error) { - return base.Configure(param, error); - } - bool Configure(const config_param ¶m, Error &error); + bool Open(AudioFormat &audio_format, Error &error); void Close() { @@ -57,6 +54,9 @@ static constexpr Domain pipe_output_domain("pipe_output"); inline bool PipeOutput::Configure(const config_param ¶m, Error &error) { + if (!base.Configure(param, error)) + return false; + cmd = param.GetBlockValue("command", ""); if (cmd.empty()) { error.Set(config_domain, @@ -72,11 +72,6 @@ pipe_output_init(const config_param ¶m, Error &error) { PipeOutput *pd = new PipeOutput(); - if (!pd->Initialize(param, error)) { - delete pd; - return nullptr; - } - if (!pd->Configure(param, error)) { delete pd; return nullptr; -- cgit v1.2.3