X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.ggo;h=0cf4bb625bcf56b4bf53c19558044c4137252055;hp=a7db080ae51c6c1e5b5244187acc8aca386aa94d;hb=828d7e8cd8577775cb81b8c9abcd5d96a7483d9b;hpb=c589157169366fa47f2041cfe52e7019fbc19b35

diff --git a/server.ggo b/server.ggo
index a7db080a..0cf4bb62 100644
--- a/server.ggo
+++ b/server.ggo
@@ -9,12 +9,12 @@ option "logfile" L "(default=stdout/stderr)" string typestr="filename" no
 option "config_file" c "(default='~/.paraslash/server.conf'" string typestr="filename" no
 option "user_list" - "(default='~/.paraslash/server.users')" string typestr="filename" no
 
-section "Options concerning the audio file sender"
+section "audio file sender"
 option "autoplay" a "start playing on startup" flag off
 option "announce_time" A "Delay betweeen announcing the stream and sending data" int typestr="milliseconds" default="300" no
-option "dbtool" D "(default=first available that works)" string typestr="name_of_dbtool" no
+option "selector" S "(default=random)" string typestr="name" no
 
-section "Mysql database tool options"
+section "mysql selector:"
 option "mysql_host" - "mysql server" string default="localhost" no
 option "mysql_port" - "where mysql is listening" int default="3306" no
 option "mysql_user" - "default value: username from /etc/passwd" string no
@@ -23,19 +23,20 @@ option "mysql_database" - "name of mysql database" string default="paraslash" no
 option "mysql_audio_file_dir"  - "dir to search for audio files (required)" string no
 option "mysql_default_score" - "scoring rule to use if stream definition does not contain explicit score definition" string default="(LASTPLAYED() / 1440 - 1000 / (LASTPLAYED() + 1) - sqrt(NUMPLAYED()))" no
 
+section "random selector"
+option "random_dir" - "dir to search for audio files" string default="/home/music" no
 
-
-section "Random database tool options"
-option "random_dbtool_dir" - "dir to search for files to be streamed" string default="/home/music" no
-
-section "Http sender options"
+section "http sender"
 option "http_port" - "tcp port for http streaming" int typestr="portnumber" default="8000" no
 option "http_default_deny" - "deny connections from hosts which are not explicitly allowed" flag off
 option "http_access" - "Add given host/network to access control list (whitelist if http_default_deny was given, blacklist otherwise) before opening the tcp port. This option can be given multiple times. Example: '192.168.0.0/24' whitelists/blacklists the 256 hosts 192.168.0.x" string typestr="a.b.c.d/n" no multiple
 option "http_no_autostart" - "do not open tcp port on server startup" flag off
 option "http_max_clients" - "maximal simultaneous connections, non-positive value means unlimited" int typestr="number" default="-1" no
 
-section "Ortp sender options"
+section "dccp sender"
+option "dccp_port" - "port for http streaming" int typestr="portnumber" default="5001" no
+
+section "ortp sender"
 option "ortp_target" - "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 224.0.1.38 (unassigned ip in the Local Network Control Block 224.0.0/24). This is useful for LAN-streaming." string typestr="a.b.c.d:p" no multiple
 option "ortp_no_autostart" - "do not start to send automatically" flag off
 option "ortp_default_port" - "default udp port if not specified" int typestr="portnumber" default="1500" no