X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=m4%2Fgengetopt%2Ffade.m4;h=59389ffefb5105ee8af56e4d7b844377c9d5d9c7;hp=7c731c2b6ec1cdf15322131827fe99add0917e09;hb=4d9d588c5df359c3c5f279fbfd4ea51d3a2afc87;hpb=650e5374914c1eb725ce7d2a720611bec22112bc

diff --git a/m4/gengetopt/fade.m4 b/m4/gengetopt/fade.m4
index 7c731c2b..59389ffe 100644
--- a/m4/gengetopt/fade.m4
+++ b/m4/gengetopt/fade.m4
@@ -1,6 +1,6 @@
 args "--conf-parser --no-handle-version --no-handle-help"
 
-purpose "An alarm clock and volume-fader for OSS and ALSA."
+purpose "An alarm clock and volume-fader for OSS and ALSA"
 
 include(header.m4)
 define(CURRENT_PROGRAM,para_fade)
@@ -17,11 +17,11 @@ option "mode" o
 #~~~~~~~~~~~~~~
 "how to fade volume"
 	enum typestr = "mode"
-	values = "sleep", "snooze", "fade"
+	values = "sleep", "fade", "set", "snooze"
 	default = "sleep"
 	optional
 	details="
-		para_fade knows three different fading modes:
+		para_fade knows the following modes:
 
 		sleep mode: Change to the initial volume and select
 		the initial afs mood/playlist. Then fade out until
@@ -33,6 +33,8 @@ option "mode" o
 		fade: Fade the volume to the given value in the
 		given time.
 
+		set: Just set the value and exit.
+
 		snooze: Fade out, sleep a bit and fade in.
 "
 
@@ -86,12 +88,15 @@ section "Options for sleep mode"
 option "ivol" -
 #~~~~~~~~~~~~~~
 "set initial volume"
-	int typestr = "volume"
+	string typestr = "[channel:]volume"
 	default = "60"
 	optional
+	multiple
 	details = "
 		Used as the start volume, before fading out to the
-		fade out volume.
+		fade out volume. The channel part may be omitted, in
+		which case the default channel is used. This option
+		may be given multiple times.
 	"
 
 option "fo-mood" -
@@ -228,4 +233,14 @@ option "fade-time" t
 	int typestr = "seconds"
 	default = "5"
 	optional
+
+section "Options for set mode"
+##############################
+
+option "val" -
+"value to set"
+	int typestr = "value"
+	default = "0"
+	optional
+
 </qu>