X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.ggo;h=6d824152d23165df92886d3059d0e6523cf339c1;hp=f0e5bb0410ea09b32b4efb5e0462333162954521;hb=695086cebfe6e44e61a6d11e64128c1f5d60fd4b;hpb=db8b9c608ae1c0eaf1afd257a1c4af2654fbeaee

diff --git a/server.ggo b/server.ggo
index f0e5bb04..6d824152 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"
 #############################
@@ -156,107 +148,20 @@ option "afs_socket" s
 	default="/var/paraslash/afs_command_socket"
 	optional
 
-option "mood" m
-#~~~~~~~~~~~~~~
-
-"Mood to load on startup."
-
-	string typestr="mood_name"
-	optional
-
-option "playlist" P
-#~~~~~~~~~~~~~~
-
-"Playlist to load on startup. Ignored if
---mood is given as well."
-
-	string typestr="playlist_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"
-	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
+#~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+"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'."
 
-option "random_dir" -
-#~~~~~~~~~~~~~~~~~~~~
-
-"dir to search for audio files"
-	string typestr="dirname"
-	default="/home/music"
+	string typestr="<specifier>/<name>"
 	optional
 
 
-
-
 section "http sender"
 #~~~~~~~~~~~~~~~~~~~~