X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=m4%2Fgengetopt%2Ffade.m4;h=42f135fa3ee5d3ed6d61faf9b4088fd00d8302e2;hb=b4171bad405e7a33e13479c227df5eaade391fc0;hp=80f8b73c3999ef3c22cea89bac2931b036ed9606;hpb=2829202e393e4b0095d62739910ae56f04e83326;p=paraslash.git

diff --git a/m4/gengetopt/fade.m4 b/m4/gengetopt/fade.m4
index 80f8b73c..42f135fa 100644
--- a/m4/gengetopt/fade.m4
+++ b/m4/gengetopt/fade.m4
@@ -1,3 +1,5 @@
+args "--conf-parser --no-handle-version"
+
 section "General options"
 #########################
 
@@ -32,23 +34,35 @@ option "config-file" c
 
 option "mixer-device" m
 #~~~~~~~~~~~~~~~~~~~~~~
-"mixer device file"
+"choose mixer device"
 	string typestr = "device"
-	default = "/dev/mixer"
 	optional
+	details = "
+		The default device (used if this option is not given)
+		depends on the selected mixer API. For ALSA, the
+		default is 'hw:0' which corresponds to the first sound
+		device. For OSS, '/dev/mixer' is used as the default.
+	"
 
 option "mixer-channel" C
 #~~~~~~~~~~~~~~~~~~~~~~~
 "select the analog mixer channel"
-	enum typestr = "channel"
-	values = "volume", "bass", "treble", "synth", "pcm", "speaker", "line",
-		"mic", "cd", "imix", "altpcm", "reclev", "igain", "ogain"
-	default = "volume"
+	string typestr = "channel"
 	optional
 	details = "
-		Not all listed channels might be supported on any
-		particular hardware.
-"
+		For the ALSA mixer API, the possible values are
+		determined at runtime depending on the hardware and
+		can be printed by specifying an invalid mixer channel,
+		for example --mixer-channel help. The default channel
+		is 'Master'.
+
+		For OSS the possible values are invariably 'volume',
+		'bass', 'treble', 'synth', 'pcm', 'speaker', 'line',
+		'mic', 'cd', 'imix', 'altpcm', 'reclev', 'igain',
+		'ogain'. However, not all listed channels might be
+		supported on any particular hardware. The default
+		channel is 'volume'.
+	"
 
 section "Options for sleep mode"
 ################################