X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.ggo;h=650dcf0e69634ee25a0c9de8154e4a0130ba8e49;hp=c524009f937d2ab09ec7369b3d8e5524a4577896;hb=d2765e8ef91706453cdc6ed3fde89baf56ac718a;hpb=5fde5b4d4abeb795f71101d1fd3524f8a27971eb

diff --git a/server.ggo b/server.ggo
index c524009f..650dcf0e 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
 
 
@@ -94,8 +94,8 @@ option "user_list" -
 
 
 
-section "audio file sender"
-#~~~~~~~~~~~~~~~~~~~~~~~~~~
+section "virtual streaming system"
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 
 option "autoplay" a
@@ -105,6 +105,15 @@ option "autoplay" a
 
 	flag off
 
+option "autoplay_delay" -
+#~~~~~~~~~~~~~~~~~~~~~~~~
+"Time to wait before autoplay starts. Ignored if
+autoplay is off."
+	int typestr="milliseconds"
+	default="0"
+	optional
+
+
 option "announce_time" A
 #~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -123,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)"
+"Command socket for the audio file selector"
 
-	string
+	string typestr="path"
+	default="/var/paraslash/afs_command_socket"
 	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="aspecifier>:<name>"
 	optional
 
 
 
-
 section "http sender"
 #~~~~~~~~~~~~~~~~~~~~