Fix a gcc warning on MacOS.

[paraslash.git] / server.ggo

diff --git a/server.ggo b/server.ggo
index a32673d56a59cce296a05ce51d27623dd7d1f1a8..650dcf0e69634ee25a0c9de8154e4a0130ba8e49 100644 (file)
--- 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
 
 
@@ -94,8 +94,8 @@ option "user_list" -
 
 
 
-section "audio file sender"
-#~~~~~~~~~~~~~~~~~~~~~~~~~~
+section "virtual streaming system"
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 
 option "autoplay" a
@@ -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"
-
-       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)"
+"Command socket for the audio file selector"
 
-       string typestr="dirname"
+       string typestr="path"
+       default="/var/paraslash/afs_command_socket"
        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"
 #~~~~~~~~~~~~~~~~~~~~