aboutsummaryrefslogtreecommitdiffstats
path: root/src/output
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2015-01-21 22:36:13 +0100
committerMax Kellermann <max@duempel.org>2015-01-21 23:30:00 +0100
commit1c3f5517fabc264d7b37935bd37197cdd68250ba (patch)
tree509f68fe930e79bfa4c70a1cf2146a347f8acdef /src/output
parent10972da06030d57429dc2c86c21e37fd0aca88dc (diff)
downloadmpd-1c3f5517fabc264d7b37935bd37197cdd68250ba.tar.gz
mpd-1c3f5517fabc264d7b37935bd37197cdd68250ba.tar.xz
mpd-1c3f5517fabc264d7b37935bd37197cdd68250ba.zip
config/Option: convert to strictly-typed enum
Diffstat (limited to 'src/output')
-rw-r--r--src/output/Init.cxx4
-rw-r--r--src/output/MultipleOutputs.cxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/output/Init.cxx b/src/output/Init.cxx
index 4a1217196..c4e4a1880 100644
--- a/src/output/Init.cxx
+++ b/src/output/Init.cxx
@@ -108,7 +108,7 @@ audio_output_mixer_type(const config_param &param)
/* fall back to the global "mixer_type" setting (also
deprecated) */
- return mixer_type_parse(config_get_string(CONF_MIXER_TYPE,
+ return mixer_type_parse(config_get_string(ConfigOption::MIXER_TYPE,
"hardware"));
}
@@ -191,7 +191,7 @@ AudioOutput::Configure(const config_param &param, Error &error)
/* create the normalization filter (if configured) */
- if (config_get_bool(CONF_VOLUME_NORMALIZATION, false)) {
+ if (config_get_bool(ConfigOption::VOLUME_NORMALIZATION, false)) {
Filter *normalize_filter =
filter_new(&normalize_filter_plugin, config_param(),
IgnoreError());
diff --git a/src/output/MultipleOutputs.cxx b/src/output/MultipleOutputs.cxx
index ba4423f77..83a8b98c9 100644
--- a/src/output/MultipleOutputs.cxx
+++ b/src/output/MultipleOutputs.cxx
@@ -74,7 +74,7 @@ LoadOutput(EventLoop &event_loop, MixerListener &mixer_listener,
void
MultipleOutputs::Configure(EventLoop &event_loop, PlayerControl &pc)
{
- for (const config_param *param = config_get_param(CONF_AUDIO_OUTPUT);
+ for (const auto *param = config_get_param(ConfigOption::AUDIO_OUTPUT);
param != nullptr; param = param->next) {
auto output = LoadOutput(event_loop, mixer_listener,
pc, *param);