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

diff --git a/server.ggo b/server.ggo
index e5238dbd..b64aaa3c 100644
--- a/server.ggo
+++ b/server.ggo
@@ -38,11 +38,11 @@ privileges right after parsing the command
 line options, but before parsing the
 configuration file. In this case,
 real/effective/saved UID are all set to the
-UID of 'username'. As the configuration file
+UID of 'name'. As the configuration file
 is read afterwards, those options that have a
 default value depending on the UID (e.g. the
 directory for the configuration file) are
-computed by using the uid of 'username'.
+computed by using the uid of 'name'.
 This option has no effect if para_server is
 started as a non-root user (i.e.  EUID != 0)"
 
@@ -59,7 +59,7 @@ Otherwise, real/effective GID and the saved
 set-group ID are all set to the GID given by
 'group'. Must not be given in the config file."
 
-	string typestr="groupname"
+	string typestr="group"
 	optional
 
 
@@ -132,10 +132,45 @@ option "selector" S
 	string typestr="name"
 	optional
 
+#############################
+section "audio file selector"
+#############################
 
+option "afs_database_dir" D
+#~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-section "mysql selector:"
-#~~~~~~~~~~~~~~~~~~~~~~~~
+"Directory containing the osl database of the
+audio file selector.
+(default='~/.paraslash/afs_database'"
+
+	string typestr="path"
+	optional
+
+
+option "afs_socket" s
+#~~~~~~~~~~~~~~~~~~~~
+
+"Command socket for the audio file selector"
+
+	string typestr="path"
+	default="/var/paraslash/afs_command_socket"
+	optional
+
+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'."
+
+	string typestr="name"
+	optional
+
+section "mysql selector"
+#~~~~~~~~~~~~~~~~~~~~~~~
 
 
 option "mysql_host" -