X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=m4%2Fgengetopt%2Ffade.m4;h=450e05423db66925449934e0c5efab0b8d850c3e;hb=0968b226713f7bab3be9185b426f766932394bc7;hp=e5d08bf00e45b7f17e7b5e8cc6d9a928d071fd50;hpb=46af7dd81149caee0409535d5d9884ed9fa5af0e;p=paraslash.git

diff --git a/m4/gengetopt/fade.m4 b/m4/gengetopt/fade.m4
index e5d08bf0..450e0542 100644
--- a/m4/gengetopt/fade.m4
+++ b/m4/gengetopt/fade.m4
@@ -32,14 +32,28 @@ option "config-file" c
 	string typestr = "filename"
 	optional
 
+option "mixer-api" a
+#~~~~~~~~~~~~~~~~~~~
+"choose the mixer API"
+	string typestr = "api"
+	optional
+	details = "
+		ALSA is preferred over OSS if both APIs are supported
+		and this option is not given. To see the supported
+		mixer APIs, use this option with an invalid string
+		as the mixer API, e.g. --mixer-api help.
+	"
+
 option "mixer-device" m
 #~~~~~~~~~~~~~~~~~~~~~~
 "choose mixer device"
 	string typestr = "device"
 	optional
 	details = "
-		If this option is not given '/dev/mixer' is used as
-		the default.
+		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
@@ -48,11 +62,18 @@ option "mixer-channel" C
 	string typestr = "channel"
 	optional
 	details = "
-		The possible values are '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 mixer channel is 'volume'.
+		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"