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

mixer/Type: mixer_type_parse() throws on error

Browse Source
This commit is contained in:
Max Kellermann
2018-08-19 07:49:54 +02:00
parent 4531e4cc55
commit aaa438e745
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/output/Init.cxx
View File

@@ -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_: