X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.ggo;h=62e08305cf95e627f69c1b6128012298b483066a;hp=4f6e05b290a2d0ea4cb1c4f61032124e8666b834;hb=cd8bb5a2d51179a31842a2cd7012cad28deea78d;hpb=08bec43bc927c6b2383d92dce3935df8121ea124

diff --git a/server.ggo b/server.ggo
index 4f6e05b2..62e08305 100644
--- a/server.ggo
+++ b/server.ggo
@@ -124,100 +124,44 @@ option "announce_time" A
 	optional
 
 
-option "selector" S
-#~~~~~~~~~~~~~~~~~~
-
-"(default=random)"
-
-	string typestr="name"
-	optional
-
-
-
-section "mysql selector"
-#~~~~~~~~~~~~~~~~~~~~~~~
-
-
-option "mysql_host" -
-#~~~~~~~~~~~~~~~~~~~~
-
-"mysql server"
+#############################
+section "audio file selector"
+#############################
 
-	string typestr="ip or hostname"
-	default="localhost"
-	optional
-
-option "mysql_port" -
-#~~~~~~~~~~~~~~~~~~~~
+option "afs_database_dir" D
+#~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-"where mysql is listening"
+"Directory containing the osl database of the
+audio file selector.
+(default='~/.paraslash/afs_database'"
 
-	int typestr="portnumber"
-	default="3306"
+	string typestr="path"
 	optional
 
 
-option "mysql_user" -
+option "afs_socket" s
 #~~~~~~~~~~~~~~~~~~~~
 
-"default value: username from /etc/passwd"
-
-	string typestr="username"
-	optional
-
-option "mysql_passwd" -
-#~~~~~~~~~~~~~~~~~~~~~~
-
-"(required)"
-
-	string
-	optional
-
-option "mysql_database" -
-#~~~~~~~~~~~~~~~~~~~~~~~~
-
-"name of mysql database"
+"Command socket for the audio file selector"
 
-	string
-	default="paraslash"
+	string typestr="path"
+	default="/var/paraslash/afs_command_socket"
 	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 "afs_initial_mode" i
+#~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-option "random_dir" -
-#~~~~~~~~~~~~~~~~~~~~
+"Mood or playlist to load on startup. Must be
+prefixed with either 'p/' or 'm/' to indicate
+whether a playlist or a mood should be
+loaded. Example:
+	--afs_initial_mode p/foo
+loads the playlist named 'foo'."
 
-"dir to search for audio files"
-	string typestr="dirname"
-	default="/home/music"
+	string typestr="<specifier>/<name>"
 	optional
 
 
-
-
 section "http sender"
 #~~~~~~~~~~~~~~~~~~~~
 
@@ -284,11 +228,22 @@ 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
 
 section "ortp sender"
 #~~~~~~~~~~~~~~~~~~~~