X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.ggo;h=e7149145d56f430dee2c6d7a3a4775fc602f2f33;hp=b64aaa3ca53deee1069ee2d88ef885f22d0debbe;hb=bc8187d6a4ca3191b3c54226ba54e4f0c4cf4e6e;hpb=53d503ce75eb1d9439cfb75053d3cff4cbca6ff9

diff --git a/server.ggo b/server.ggo
index b64aaa3c..e7149145 100644
--- a/server.ggo
+++ b/server.ggo
@@ -124,14 +124,6 @@ option "announce_time" A
 	optional
 
 
-option "selector" S
-#~~~~~~~~~~~~~~~~~~
-
-"(default=random)"
-
-	string typestr="name"
-	optional
-
 #############################
 section "audio file selector"
 #############################
@@ -160,98 +152,15 @@ option "afs_initial_mode" i
 #~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 "Mood or playlist to load on startup. Must be
-prefixed with either 'p:' or 'm:' to indicate
+prefixed with either 'p/' or 'm/' to indicate
 whether a playlist or a mood should be
 loaded. Example:
-	--afs_initial_mode p:foo
+	--afs_initial_mode p/foo
 loads the playlist named 'foo'."
 
-	string typestr="name"
-	optional
-
-section "mysql selector"
-#~~~~~~~~~~~~~~~~~~~~~~~
-
-
-option "mysql_host" -
-#~~~~~~~~~~~~~~~~~~~~
-
-"mysql server"
-
-	string typestr="ip or hostname"
-	default="localhost"
-	optional
-
-option "mysql_port" -
-#~~~~~~~~~~~~~~~~~~~~
-
-"where mysql is listening"
-
-	int typestr="portnumber"
-	default="3306"
-	optional
-
-
-option "mysql_user" -
-#~~~~~~~~~~~~~~~~~~~~
-
-"default value: username from /etc/passwd"
-
-	string typestr="username"
-	optional
-
-option "mysql_passwd" -
-#~~~~~~~~~~~~~~~~~~~~~~
-
-"(required)"
-
-	string
-	optional
-
-option "mysql_database" -
-#~~~~~~~~~~~~~~~~~~~~~~~~
-
-"name of mysql database"
-
-	string
-	default="paraslash"
+	string typestr="<specifier>/<name>"
 	optional
 
-option "mysql_audio_file_dir"  -
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-"dir to search for audio files (required)"
-
-	string typestr="dirname"
-	optional
-
-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()))"
-	optional
-
-
-
-
-section "random selector"
-#~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-option "random_dir" -
-#~~~~~~~~~~~~~~~~~~~~
-
-"dir to search for audio files"
-	string typestr="dirname"
-	default="/home/music"
-	optional
-
-
-
 
 section "http sender"
 #~~~~~~~~~~~~~~~~~~~~
@@ -319,10 +228,31 @@ option "dccp_port" -
 "port for dccp streaming"
 
 	int typestr="portnumber"
-	default="5001"
+	default="8000"
+	optional
+
+option "dccp_default_deny" -
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~
+"See http_default_deny"
+
+	flag off
+
+option "dccp_access" -
+#~~~~~~~~~~~~~~~~~~~~~
+"See http_access"
+
+	string typestr="a.b.c.d/n"
 	optional
+	multiple
 
+option "dccp_max_clients" -
+#~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+"see http_max_clients"
+
+	int typestr="number"
+	default="-1"
+	optional
 
 
 section "ortp sender"