X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ggo%2Faudiod.m4;h=1b5008540af26a18166e38dfaec6b3eca839171d;hp=29bce100380c44e63841c56aff734107f9b324f8;hb=a24d175e6d093d6d9f6e583c3026e45924bad621;hpb=d77771bcc0ac980b3015c13d3f8a24ff59f813e8

diff --git a/ggo/audiod.m4 b/ggo/audiod.m4
index 29bce100..1b500854 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.
 "
 
@@ -135,22 +136,23 @@ option "no_default_filters" D
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 "Configure filters manually"
 flag off
-details="
+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.
+	(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