X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ggo%2Faudiod.m4;h=9aabd575b0519cc5f763219e135c3726c6e38611;hp=628188d559bcc2ed718d9ac963adadc3e6ad7d12;hb=869f0e06ec4e15abc9230c1b2d7615da5250802e;hpb=c1eeb775819a9f3805f4df580d0c6bd1398fed4e

diff --git a/ggo/audiod.m4 b/ggo/audiod.m4
index 628188d5..9aabd575 100644
--- a/ggo/audiod.m4
+++ b/ggo/audiod.m4
@@ -142,42 +142,30 @@ details="
 
 "
 
-option "no_default_filters" D
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-"Configure filters manually"
-flag off
-details = "
-	If (and only if) this option is set, the --filter options
-	(see below) take effect. Otherwise, the compiled-in defaults
-	apply.	These defaults depend on the receiver being used as
-	described below.
-
-	For http streams, only a single filter per audio format,
-	the decoder for that format, is activated. On the other hand,
-	since udp and dccp streams are sent fec-encoded by para_server,
-	the client side must feed the output of the receiver into
-	the fecdec filter first. Therefore the default for udp and
-	dccp streams is to activate the fecdec filter, followed by
-	the appropriate decoder.
-
-	You must give this option if you want to use any other filter,
-	for example the amp or the compress filter.
-
-"
-
 option "filter" f
 #~~~~~~~~~~~~~~~~
-"Use non-default filters"
-string typestr="filter_spec"
+"Specify the filter configuration."
+string typestr = "filter_spec"
 optional
 multiple
-dependon="no_default_filters"
-details="
+details = "
 	This option may be given multiple times. The \"filter_spec\"
 	consists of an audio format specifier (see above), the name
 	of the filter, and any options for that filter. Note that
 	order matters.
 
+	The compiled-in defaults apply to all audio formats for which
+	no --filter option was given. These defaults depend on the
+	receiver being used.
+
+	For HTTP streams, only the decoder for the current audio
+	format is activated. UDP and DCCP streams, on the other
+	hand, are sent FEC-encoded by para_server. In order to play
+	such streams, the receiver output must be FEC-decoded first,
+	i.e. fed to the fecdec filter. Therefore the default for UDP
+	and DCCP streams is to activate the fecdec filter, followed
+	by the decoding filter for the audio format.
+
 	Examples:
 
 		--filter 'mp3:mp3dec'
@@ -214,7 +202,7 @@ details="
 	announced by para_server and do not send data to the writer
 	before that time (modulo clock difference).
 
-	This is useful mainly for syncronizing the audio output of
+	This is useful mainly for synchronizing the audio output of
 	different clients.
 "
 </qu>