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

diff --git a/server.ggo b/server.ggo
index f0e5bb04..b64aaa3c 100644
--- a/server.ggo
+++ b/server.ggo
@@ -156,21 +156,17 @@ 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
-#~~~~~~~~~~~~~~
+option "afs_initial_mode" i
+#~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-"Playlist to load on startup. Ignored if
---mood is given as well."
+"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'."
 
-	string typestr="playlist_name"
+	string typestr="name"
 	optional
 
 section "mysql selector"