From e44ea5038e316d9002e8f9aa055f5c7e7642a782 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 26 Aug 2014 10:19:14 +0200 Subject: [PATCH] output/alsa: merge Init() into Configure() --- src/output/plugins/AlsaOutputPlugin.cxx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/output/plugins/AlsaOutputPlugin.cxx b/src/output/plugins/AlsaOutputPlugin.cxx index 04e2bced3..4ac314a2a 100644 --- a/src/output/plugins/AlsaOutputPlugin.cxx +++ b/src/output/plugins/AlsaOutputPlugin.cxx @@ -132,10 +132,6 @@ struct AlsaOutput { mode(0), writei(snd_pcm_writei) { } - bool Init(const config_param ¶m, Error &error) { - return base.Configure(param, error); - } - bool Configure(const config_param ¶m, Error &error); }; @@ -148,8 +144,11 @@ alsa_device(const AlsaOutput *ad) } inline bool -AlsaOutput::Configure(const config_param ¶m, gcc_unused Error &error) +AlsaOutput::Configure(const config_param ¶m, Error &error) { + if (!base.Configure(param, error)) + return false; + device = param.GetBlockValue("device", ""); use_mmap = param.GetBlockValue("use_mmap", false); @@ -183,7 +182,7 @@ alsa_init(const config_param ¶m, Error &error) { AlsaOutput *ad = new AlsaOutput(); - if (!ad->Init(param, error) || !ad->Configure(param, error)) { + if (!ad->Configure(param, error)) { delete ad; return nullptr; }