X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ggo%2Faudiod.m4;h=1bc5db14e5ec35bb6de27bed651ac66da76c2713;hp=4205c3f53294ac80091864d3d459c29e4207b233;hb=88c5dc601a5d1b194da3102566a3fb97947a6aee;hpb=3d0706fb869570dde858227b02aab558439c3d6a;ds=sidebyside

diff --git a/ggo/audiod.m4 b/ggo/audiod.m4
index 4205c3f5..1bc5db14 100644
--- a/ggo/audiod.m4
+++ b/ggo/audiod.m4
@@ -12,6 +12,7 @@ include(loglevel.m4)
 include(color.m4)
 include(config_file.m4)
 include(logfile.m4)
+include(log_timing.m4)
 include(daemon.m4)
 include(user.m4)
 include(group.m4)
@@ -103,7 +104,7 @@ details="
 	Check the clock difference between the host running para_server
 	and the local host running para_audiod that many times before
 	starting any stream I/0. Set this to non-zero for non-local
-	setups if the clocks of these two hosts are not syncronized
+	setups if the clocks of these two hosts are not synchronized
 	by ntp or similar.
 "
 
@@ -119,57 +120,68 @@ default="http"
 optional
 multiple
 details="
-	This option may be given multiple times, once for each
-	supported audio format. The \"receiver_spec\" consists of
-	an audio format and the receiver name, separated by a colon,
-	and any options for that receiver, seperated by whitespace.
-	If any receiver options are present, the whole receiver
-	argument must be quoted.
+	This option may be given multiple times, for each audio format
+	separately. If multiple definitions for an audio format are
+	given, the first one is selected.
+
+	The \"receiver_spec\" consists of an audio format specifier
+	and one or more receiver arguments, separated by a colon.
 
-	Example:
+	The audio format specifier is a regular expression which
+	specifies the set of audio formats for which this option
+	should apply.
+
+	If any receiver options are present, the whole receiver
+	argument must be quoted:
 
 		-r 'mp3:http -i my.host.org -p 8009'
+
+	Since a single dot '.' matches the name of any audio format,
+	specifying '.' instead of 'mp3' above activates the http
+	receiver for all audio formats.
+
 "
 
 option "no_default_filters" D
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-"Configure filters manually"
+"deprecated"
 flag off
-details="
-	If (and only if) this option is set, the --filter options
-	(see below) take effect. Otherwise, the compiled-in default
-	filters mp3dec, oggdec and aacdec are activated for mp3, ogg,
-	aac streams respectively.
-
-	You have to configure filters manually if you want to use
-	the amp filter or the compress filter which are not activated
-	by default.
-
-	Playing udp streams also requires manual filter configuration
-	because the output of the udp receiver must be fed into the
-	fecdec filter first to produce a stream which can be decoded
-	by the appropriate decoder (mp3dec, oggdec, aacdec). In other
-	words, the fecdec filter must be specified as the first filter
-	of the filter chain for any udp stream.
+details = "
+	This option is was deprecated in paraslash-0.4.10 and has no
+	effect any more. It will be removed in the next version.
 "
 
 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, the name of the filter, and any
-	options for that filter. Mote that order matters.
+	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'
 
-		--filter 'mp3:compress --inertia 5 --damp 2'
+		--filter 'mp3|aac:compress --inertia 5 --damp 2'
+
+		--filter '.:fecdec'
 
 "
 
@@ -184,7 +196,7 @@ details="
 	audio format.  Default value is \"alsa\" for all supported
 	audio formats. Example:
 
-		--writer 'aac:osx'
+		--writer 'aac|wma:oss'
 
 "
 
@@ -199,7 +211,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>