Merge branch 'sched'

[paraslash.git] / audiod.ggo

diff --git a/audiod.ggo b/audiod.ggo
index 89cad59c69e1045fcbf21d682ecd787053805159..94bf59d012a9837a29a3e6089555051700379e8c 100644 (file)
--- a/audiod.ggo
+++ b/audiod.ggo
@@ -151,13 +151,7 @@ option "writer" w
 May be given multiple times, even multiple
 times for the same audio format.  Default
 value is 'alsa' for all supported audio
 May be given multiple times, even multiple
 times for the same audio format.  Default
 value is 'alsa' for all supported audio

-formats.  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.
-
-Example:
+formats. Example:

 
        -w 'aac:osx'
 
 
        -w 'aac:osx'
 


@@ -172,10 +166,8 @@ option "stream_delay" -
 
 "Time to add to para_server's start_time.
 
 
 "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"
 
        int typestr="milliseconds"
        default="200"