X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.ggo;h=650dcf0e69634ee25a0c9de8154e4a0130ba8e49;hp=4f6e05b290a2d0ea4cb1c4f61032124e8666b834;hb=741dc05a35312034c8f1e20c5c08a6755812ba67;hpb=cbef31a5d0b06802f55f6de4867e27cc6f92fd79;ds=sidebyside

diff --git a/server.ggo b/server.ggo
index 4f6e05b2..650dcf0e 100644
--- a/server.ggo
+++ b/server.ggo
@@ -132,92 +132,45 @@ option "selector" S
 	string typestr="name"
 	optional
 
+#############################
+section "audio file selector"
+#############################
 
+option "afs_database_dir" D
+#~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-section "mysql selector"
-#~~~~~~~~~~~~~~~~~~~~~~~
-
-
-option "mysql_host" -
-#~~~~~~~~~~~~~~~~~~~~
-
-"mysql server"
-
-	string typestr="ip or hostname"
-	default="localhost"
-	optional
-
-option "mysql_port" -
-#~~~~~~~~~~~~~~~~~~~~
-
-"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"
+"Command socket for the audio file selector"
 
-	string typestr="username"
+	string typestr="path"
+	default="/var/paraslash/afs_command_socket"
 	optional
 
-option "mysql_passwd" -
-#~~~~~~~~~~~~~~~~~~~~~~
-
-"(required)"
-
-	string
-	optional
-
-option "mysql_database" -
-#~~~~~~~~~~~~~~~~~~~~~~~~
-
-"name of mysql database"
-
-	string
-	default="paraslash"
-	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="aspecifier>:<name>"
 	optional
 
 
 
-
 section "http sender"
 #~~~~~~~~~~~~~~~~~~~~