From: Andre Noll Date: Tue, 30 Jan 2018 18:56:16 +0000 (+0100) Subject: mixer: Remove default moods for sleep. X-Git-Tag: v0.6.2~39 X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=cdadcb0750434d4d13e4714ec987c7e9e90fb119;p=paraslash.git mixer: Remove default moods for sleep. The documented behavior of the sleep subcommand is to not fade out if no fade out mood was given. The current code, however, tries to switch to the default m/fade. This fails if this mood does not exist, causing the sleep subcommand to terminate. By removing the default value we get the documented behaviour. The --fo-mood and --sleep-mood suffer from the same issue and can be fixed in the same way. --- diff --git a/m4/lls/mixer.suite.m4 b/m4/lls/mixer.suite.m4 index 37ecbd81..3019f769 100644 --- a/m4/lls/mixer.suite.m4 +++ b/m4/lls/mixer.suite.m4 @@ -170,7 +170,6 @@ caption = List of subcommands arg_info = required_arg arg_type = string typestr = mood_spec - default_val = m/fade [help] This mood (or playlist) is selected right after setting the initial volume. @@ -195,7 +194,6 @@ caption = List of subcommands arg_info = required_arg arg_type = string typestr = mood_spec - default_val = m/sleep [help] Select the given mood or playlist after the fade-out. If unset, playback is stopped until fade-in starts. @@ -217,7 +215,6 @@ caption = List of subcommands arg_info = required_arg arg_type = string typestr = mood_spec - default_val = m/wake [help] This mood or playlist is selected right before fade-in begins. [/help]