X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.ggo;h=fc60637204c2362854cc0866e1218fd9239ea8ae;hp=bbcb09b8a07e71654f812cd11891cccf93fec6ea;hb=11018ebcc1cb1c002fc3488d247a43774ca408d7;hpb=56ee850b0f0c8bd7a7cc16ad9dec148e6c955faa

diff --git a/server.ggo b/server.ggo
index bbcb09b8..fc606372 100644
--- a/server.ggo
+++ b/server.ggo
@@ -6,8 +6,37 @@ option "loglevel" l
 #~~~~~~~~~~~~~~~~~~
 "set loglevel (0-6)"
 int typestr="level"
-default="4"
+default="3"
 optional
+details="
+	Larger values mean less verbose output. Loglevel 0 (debug) gets
+	really noisy; a value of 1 (info) produces still noisy output,
+	but this won't fill up the disk quicky. Messaged logged with
+	loglevel 2 (notice) indicate normal but significant events
+	while level 3 (warning) logs unexpected events that can be
+	handled. Unhandled error conditions are logged with loglevel
+	4 (error) and crititcal errors are logged using loglevel 5
+	(crit).  Finally, loglevel 6 (emerg) is reserved for messages
+	that cause para_server to terminate immediately.
+"
+
+option "color" C
+#~~~~~~~~~~~~~~~
+"activate color output"
+enum typestr="when"
+values = "yes","no","auto"
+default = "auto"
+optional
+
+option "log_color" -
+#~~~~~~~~~~~~~~~~~~~
+"select a color for one type of log message"
+string typestr="color_spec"
+multiple
+optional
+details="
+	Example: --log_color \"INFO:yellow black bold\"
+"
 
 option "port" p
 #~~~~~~~~~~~~~~
@@ -26,6 +55,7 @@ option "daemon" d
 #~~~~~~~~~~~~~~~~
 "run as background daemon"
 flag off
+dependon="logfile"
 details="
 	Note that para_server refuses to start in daemon mode if no
 	logfile was specified.
@@ -150,9 +180,8 @@ option "afs_database_dir" D
 string typestr="path"
 optional
 details="
-	Where para_server should look for the  osl
-	database of the audio file selector. The default is
-	'~/.paraslash/afs_database'.
+	Where para_server should look for the osl database of the audio
+	file selector. The default is '~/.paraslash/afs_database'.
 "
 
 option "afs_socket" s
@@ -292,48 +321,48 @@ details="
 	See http_max_clients for details.
 "
 
-#####################
-section "ortp sender"
-#####################
+####################
+section "udp sender"
+####################
 
-option "ortp_target" -
-#~~~~~~~~~~~~~~~~~~~~~
-"add ortp target"
+option "udp_target" -
+#~~~~~~~~~~~~~~~~~~~~
+"add udp target"
 string typestr="a.b.c.d:p"
 optional
 multiple
 details="
 	Add given host/port to the list of targets.  This option
-	can be given multiple times.  Example: '224.0.1.38:1500'
-	instructs the ortp sender to send to udp port 1500 on host
+	can be given multiple times. Example: '224.0.1.38:1500'
+	instructs the udp sender to send to udp port 1500 on host
 	224.0.1.38 (unassigned ip in the Local Network Control Block
-	224.0.0/24). This is useful for LAN-streaming.
+	224.0.0/24). This is useful for multicast streaming.
 "
 
-option "ortp_no_autostart" -
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~
+option "udp_no_autostart" -
+#~~~~~~~~~~~~~~~~~~~~~~~~~~
 "do not start sending"
 flag off
 details="
-	If this option is given, ortp streaming may be activated at
+	If this option is given, udp streaming may be activated at
 	a later time by using the sender command.
 "
 
-option "ortp_default_port" -
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~
+option "udp_default_port" -
+#~~~~~~~~~~~~~~~~~~~~~~~~~~
 "udp port to send to"
 int typestr="port"
-default="1500"
+default="8000"
 optional
 
-option "ortp_header_interval" H
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+option "udp_header_interval" H
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 "duration for sending header"
 int typestr="ms"
 default="2000"
 optional
 details="
-	As the ortp sender has no idea about connected clients it
+	As the udp sender has no idea about connected clients it
 	sends the audio file header periodically if necessary. This
 	option is used to specify the duration of the interval between
 	sending the header. Shorter values decrease the average time
@@ -343,14 +372,14 @@ details="
 	audio format that needs an audio file header.
 "
 
-option "ortp_jitter_compensation" j
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-"configure jitter compensation"
-int typestr="ms"
-default="400"
+option "udp_ttl" t
+#~~~~~~~~~~~~~~~~~
+"set time to live value"
+int typestr="num"
+default="10"
 optional
 details="
-	ortp's adaptive jitter compensation gets activated whenever
-	this value is greater than zero. See the ortp documentation
-	about details on this feature.
+	This option instructs the udp sender to set the time to live to
+	\"num\" for the sending udp socket. Only useful for multicast
+	udp streaming.
 "