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

output/pipe: merge Initialize() and Configure()

This commit is contained in:
Max Kellermann 2014-12-27 18:56:08 +01:00
parent 5fc0ce80fc
commit 0e28b53242
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/output/plugins/PipeOutputPlugin.cxx
View File

@ -37,11 +37,8 @@ struct PipeOutput {
PipeOutput() PipeOutput()
:base(pipe_output_plugin) {} :base(pipe_output_plugin) {}
bool Initialize(const config_param &param, Error &error) {
return base.Configure(param, error);
}
bool Configure(const config_param &param, Error &error); bool Configure(const config_param &param, Error &error);
bool Open(AudioFormat &audio_format, Error &error); bool Open(AudioFormat &audio_format, Error &error);
void Close() { void Close() {
@ -57,6 +54,9 @@ static constexpr Domain pipe_output_domain("pipe_output");
inline bool inline bool
PipeOutput::Configure(const config_param &param, Error &error) PipeOutput::Configure(const config_param &param, Error &error)
{ {
if (!base.Configure(param, error))
return false;
cmd = param.GetBlockValue("command", ""); cmd = param.GetBlockValue("command", "");
if (cmd.empty()) { if (cmd.empty()) {
error.Set(config_domain, error.Set(config_domain,
@ -72,11 +72,6 @@ pipe_output_init(const config_param &param, Error &error)
{ {
PipeOutput *pd = new PipeOutput(); PipeOutput *pd = new PipeOutput();
if (!pd->Initialize(param, error)) {
delete pd;
return nullptr;
}
if (!pd->Configure(param, error)) { if (!pd->Configure(param, error)) {
delete pd; delete pd;
return nullptr; return nullptr;