X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=m4%2Flls%2Fmixer.suite.m4;h=3019f7693a1d986f53cfcea45d13e572a4295a5f;hp=83d6ad955771c9f4a9bd0ccc567e0156e2f8da0e;hb=fa6d68a0278a724b089a58bdfa29307ae6399862;hpb=7031f4e380b429e9c0eea1b8e5484dabdbb12ae5

diff --git a/m4/lls/mixer.suite.m4 b/m4/lls/mixer.suite.m4
index 83d6ad95..3019f769 100644
--- a/m4/lls/mixer.suite.m4
+++ b/m4/lls/mixer.suite.m4
@@ -62,6 +62,25 @@ caption = List of subcommands
 			'reclev', 'igain', 'ogain'. However, not all listed channels might be
 			supported on any particular hardware. The default channel is 'volume'.
 		[/help]
+	[option fade-exponent]
+		summary = set non-linear time scale for fading
+		arg_info = required_arg
+		arg_type = uint32
+		typestr = value
+		default_val = 0
+		[help]
+			This option affects the fade, snooze and sleep subcommands. It is
+			ignored in set mode.
+
+			The argument must be a number between 0 and 100. The default value
+			0 corresponds to linear scaling. That is, the value of the mixer
+			channel is increased or decreased in fixed time intervals until the
+			destination value is reached. Exponents between 1 and 99 cause low
+			channel values to be increased more quickly than high channel values.
+			Large exponents cause greater differences. The special value 100 sets
+			the destination value immediately. The command then sleeps for the
+			configured fade time.
+		[/help]
 [subcommand help]
 	purpose = print subcommand help
 	non-opts-name = [<subcommand>]
@@ -151,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.
@@ -176,32 +194,27 @@ 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.
 		[/help]
-	[option wake-hour]
-		short_opt = H
-		summary = A number between 0 and 23
+	[option wake-time]
+		short_opt = w
+		summary = when to start fade in
 		arg_info = required_arg
-		arg_type = uint32
-		typestr = hour
+		arg_type = string
+		typestr = [+][HH][:MM]
+		default_val = +9:00
 		[help]
-			If this is not given, the default is computed as now + 9 hours.
+			If the optional plus character is given, the wake time is computed as
+			now + HH hours + MM minutes. Otherwise the HH:MM argument is considered
+			an absolute time (referring to either the current or the next day).
 		[/help]
-	[option wake-min]
-		short_opt = M
-		summary = A number between 0 and 59
-		arg_info = required_arg
-		arg_type = uint32
-		typestr = minutes
 	[option fi-mood]
 		summary = mood or playlist for fade-in
 		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]