From 1c3f5517fabc264d7b37935bd37197cdd68250ba Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 21 Jan 2015 22:36:13 +0100 Subject: config/Option: convert to strictly-typed enum --- src/output/Init.cxx | 4 ++-- src/output/MultipleOutputs.cxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/output') 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 ¶m) /* 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 ¶m, 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); -- cgit v1.2.3