X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.ggo;h=66e81a1129ada287f07a1c815ecd507fc9544f54;hp=5e89e6a40aafd839966157a37431f508ac6d5526;hb=d5af72bb0148e2df6fac6aba10a64e48dab212fd;hpb=5fde5b4d4abeb795f71101d1fd3524f8a27971eb

diff --git a/audiod.ggo b/audiod.ggo
index 5e89e6a4..66e81a11 100644
--- a/audiod.ggo
+++ b/audiod.ggo
@@ -85,6 +85,20 @@ connect."
 	multiple
 
 
+option "clock_diff_count" -
+#~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+"check the clock difference between
+server_host (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 by ntp or similar."
+
+	int typestr="count"
+	default="0"
+	optional
 
 
 section "stream i/o options."
@@ -119,8 +133,8 @@ option "no_default_filters" D
 "Configure filters manually. If (and only
 if) this option is set, the --filter options
 take effect.  Otherwise, the compiled-in
-default filters mp3dec (oggdec) and wav are
-activated for mp3 (ogg) streams."
+default filters mp3dec, oggdec and aacdec are
+activated for mp3, ogg, aac streams respectively."
 
 	flag off
 
@@ -143,20 +157,20 @@ see --no_default_filters."
 string typestr="filter_spec" optional multiple
 
 
-option "stream_write_cmd" w
+option "writer" w
 #~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 "Specify stream writer.
 
-May be given multiple times, once for each
-supported audio format. Default value is
-'para_play' for both mp3 and ogg. You can use
-the START_TIME() macro for these commands.
-Each occurence of START_TIME() gets replaced
-at runtime by the stream start time announced
-by para_server, plus any offsets."
+May be given multiple times, even multiple
+times for the same audio format.  Default
+value is 'alsa' for all supported audio
+formats. Example:
+
+	-w 'aac:osx'
 
-	string typestr="format:command"
+"
+	string typestr="writer_spec"
 	optional
 	multiple
 
@@ -166,10 +180,8 @@ option "stream_delay" -
 
 "Time to add to para_server's start_time.
 
-Amount of time to be added to the server
-stream start time for stream_write_cmd if
-START_TIME() was given. Useful for
-syncronizing the audio output of clients."
+Amount of time to be added to the server, before data is sent to
+the writer.  Useful for syncronizing the audio output of clients."
 
 	int typestr="milliseconds"
 	default="200"