X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fgengetopt%2Fwrite.m4;h=6667cb8c8d76dc618d010696a77293c9d0f48158;hb=bd33d7a13fa2cb65d37e5bbf5abdbb62e9b10610;hp=56698e187839786bdbb86558cc8c1171b945dba9;hpb=35e284e06a5c8e20d02b61fdcb4bcc20b237c1e4;p=paraslash.git

diff --git a/m4/gengetopt/write.m4 b/m4/gengetopt/write.m4
index 56698e18..6667cb8c 100644
--- a/m4/gengetopt/write.m4
+++ b/m4/gengetopt/write.m4
@@ -1,5 +1,7 @@
 args "--no-handle-help --no-handle-version"
 
+purpose "Play wav or raw audio"
+
 include(header.m4)
 include(loglevel.m4)
 
@@ -7,39 +9,14 @@ option "writer" w
 #~~~~~~~~~~~~~~~~
 "select stream writer"
 string typestr="name"
-default="alsa (file if alsa is unsupported)"
 optional
 multiple
 details="
-	May be give multiple times. The same writer may be specified
-	more than once.
-"
-
-text "
-       The following options are only necessary for raw audio. When
-       playing wav files this information is obtained from the
-       wave header.
+	May be given multiple times, and the same writer may be specified more
+	than once. If this option is not given, the first supported writer
+	is started. The list of supported writers is shown in the help output.
 "
 
-option "channels" c
-#~~~~~~~~~~~~~~~~~~
-"specify number of channels"
-int typestr = "num"
-default = "2"
-optional
-
-option "sample-rate" s
-#~~~~~~~~~~~~~~~~~~~~~
-"force given sample rate"
-int typestr = "num"
-default = "44100"
-optional
-
-option "sample-format" f
-#~~~~~~~~~~~~~~~~~~~~~~~
-"specify sample format"
-# This must match the enum sample_format of para.h
-values = "S8", "U8", "S16_LE", "S16_BE", "U16_LE", "U16_BE" enum
-default = "S16_LE"
-optional
-
+include(channels.m4)
+include(sample_rate.m4)
+include(sample_format.m4)