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

MixerType: convert to strictly-typed enum

Browse Source
This commit is contained in:
Max Kellermann
2014-12-02 18:17:47 +01:00
parent 21c42819c7
commit f2bd2c318c
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/output/Init.cxx
View File

@@ -103,7 +103,7 @@ audio_output_mixer_type(const config_param &param)
/* try the local "mixer_enabled" setting next (deprecated) */
if (!param.GetBlockValue("mixer_enabled", true))
return MIXER_TYPE_NONE;
return MixerType::NONE;
/* fall back to the global "mixer_type" setting (also
deprecated) */
@@ -122,18 +122,18 @@ audio_output_load_mixer(EventLoop &event_loop, AudioOutput &ao,
Mixer *mixer;
switch (audio_output_mixer_type(param)) {
case MIXER_TYPE_NONE:
case MIXER_TYPE_UNKNOWN:
case MixerType::NONE:
case MixerType::UNKNOWN:
return nullptr;
case MIXER_TYPE_HARDWARE:
case MixerType::HARDWARE:
if (plugin == nullptr)
return nullptr;
return mixer_new(event_loop, *plugin, ao, listener,
param, error);
case MIXER_TYPE_SOFTWARE:
case MixerType::SOFTWARE:
mixer = mixer_new(event_loop, software_mixer_plugin, ao,
listener,
config_param(),