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

output/alsa: merge Init() into Configure()

Browse Source
This commit is contained in:
Max Kellermann 2014-08-26 10:19:14 +02:00
parent b111aa0111
commit e44ea5038e
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/output/plugins/AlsaOutputPlugin.cxx
View File

@ -132,10 +132,6 @@ struct AlsaOutput {
mode(0), writei(snd_pcm_writei) { mode(0), writei(snd_pcm_writei) {
} }
bool Init(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);
}; };
@ -148,8 +144,11 @@ alsa_device(const AlsaOutput *ad)
} }
inline bool inline bool
AlsaOutput::Configure(const config_param &param, gcc_unused Error &error) AlsaOutput::Configure(const config_param &param, Error &error)
{ {
if (!base.Configure(param, error))
return false;
device = param.GetBlockValue("device", ""); device = param.GetBlockValue("device", "");
use_mmap = param.GetBlockValue("use_mmap", false); use_mmap = param.GetBlockValue("use_mmap", false);
@ -183,7 +182,7 @@ alsa_init(const config_param &param, Error &error)
{ {
AlsaOutput *ad = new AlsaOutput(); AlsaOutput *ad = new AlsaOutput();
if (!ad->Init(param, error) || !ad->Configure(param, error)) { if (!ad->Configure(param, error)) {
delete ad; delete ad;
return nullptr; return nullptr;
} }