diff options
| author | Max Kellermann <max@musicpd.org> | 2018-08-19 07:49:54 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2018-08-19 07:49:54 +0200 |
| commit | aaa438e745dbab22f77aff9db00ce9038a07df08 (patch) | |
| tree | 3dd15e6e6f703606cba4d1b95e76a4b062a77f73 /src/output | |
| parent | 4531e4cc55fa57964a3014fd65877ead3c23fa5d (diff) | |
mixer/Type: mixer_type_parse() throws on error
Diffstat (limited to 'src/output')
| -rw-r--r-- | src/output/Init.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/output/Init.cxx b/src/output/Init.cxx index 0924a0f00..9cac298fe 100644 --- a/src/output/Init.cxx +++ b/src/output/Init.cxx @@ -87,9 +87,8 @@ audio_output_detect() * This handles the deprecated options mixer_type (global) and * mixer_enabled, if the mixer_type setting is not configured. */ -gcc_pure static MixerType -audio_output_mixer_type(const ConfigBlock &block) noexcept +audio_output_mixer_type(const ConfigBlock &block) { /* read the local "mixer_type" setting */ const char *p = block.GetBlockValue("mixer_type"); @@ -117,7 +116,6 @@ audio_output_load_mixer(EventLoop &event_loop, FilteredAudioOutput &ao, switch (audio_output_mixer_type(block)) { case MixerType::NONE: - case MixerType::UNKNOWN: return nullptr; case MixerType::NULL_: |