X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.ggo;h=8b0249c11a2c6a8d49562b01e0d9e4f056c518c2;hp=cafc851921eb2b650cc510185bfda7d77d25da10;hb=c430e588047c5db3eb0d043c4dd1378680ec2bcf;hpb=2ed89c59f0efcd0a2763f47c7d3455663241e623

diff --git a/audiod.ggo b/audiod.ggo
index cafc8519..8b0249c1 100644
--- a/audiod.ggo
+++ b/audiod.ggo
@@ -1,11 +1,11 @@
 section "general options"
-option "user" u "run as user 'name'. Read the output of 'para_server -h' for a detailed information on this option." string typestr="name" no
-option "loglevel" l "set loglevel (0-6)" int typestr="level" default="4" no
+option "user" u "run as user 'name'. Read the output of 'para_server -h' for a detailed information on this option." string typestr="name" optional
+option "loglevel" l "set loglevel (0-6)" int typestr="level" default="4" optional
 option "daemon" d "run as background daemon" flag off
 option "force" F "force startup even if socket exits" flag off
-option "logfile" L "(default=stdout/stderr)" string typestr="filename" no
-option "mode" m "mode to use on startup (on/off/sb)" string typestr="mode" default="on" no
-option "socket" s "well-known socket to listen on (default=/var/paraslash/audiod_sock.<host_name>)" string typestr="filename" no
+option "logfile" L "(default=stdout/stderr)" string typestr="filename" optional
+option "mode" m "mode to use on startup (on/off/sb)" string typestr="mode" default="on" optional
+option "socket" s "well-known socket to listen on (default=/var/paraslash/audiod_sock.<host_name>)" string typestr="filename" optional
 
 option "user_allow" -
 
@@ -14,7 +14,7 @@ May be specified multiple times. If not
 specified at all, allow all users to
 connect."
 
-int typestr="uid" default="-1" no multiple
+int typestr="uid" default="-1" optional multiple
 
 section "stream i/o options."
 
@@ -24,16 +24,18 @@ option "receiver" r "Select receiver.
 
 May be given multiple times, once for each
 supported audio format. receiver_spec
-consists of an audio format, the receiver
-name and any options for that receiver,
-seperated by colons.
+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.
 
 Example:
 
--r mp3:http:-i:www.paraslash.org:-p:8009
+-r 'mp3:http -i www.paraslash.org -p 8009'
 "
 
-string typestr="receiver_spec" default="http" no multiple
+string typestr="receiver_spec" default="http" optional multiple
 
 #################
 option "no_default_filters" D "Configure filters manually.
@@ -50,17 +52,16 @@ option "filter" f "Select filter(s) manually.
 
 May be given multiple times. filter_spec
 consists of an audio format, the name of the
-filter, and any options for that filter,
-separated by colons.
+filter, and any options for that filter.
 
 Examples:
 	-f mp3:mp3dec
-	-f:mp3:compress:--anticlip:--volume:2
+	-f 'mp3:compress --inertia 5 --damp 2'
 
 Note that these options are ignored by default,
 see --no_default_filters."
 
-string typestr="filter_spec" no multiple
+string typestr="filter_spec" optional multiple
 
 #################
 
@@ -76,7 +77,7 @@ Each occurence of START_TIME() gets replaced
 at runtime by the stream start time announced
 by para_server, plus any offsets."
 
-string typestr="format:command" no multiple
+string typestr="format:command" optional multiple
 
 #################
 
@@ -97,4 +98,4 @@ option "stream_timeout" -
 
 "Deactivate slot if idle for that many seconds"
 
-int typestr="seconds" default="30" no
+int typestr="seconds" default="30" optional