From db8b9c608ae1c0eaf1afd257a1c4af2654fbeaee Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Thu, 4 Oct 2007 16:41:05 +0200 Subject: [PATCH] Add command line options --mood and --playlist. And replace the temporary strings which were hardcoded in afs.c. --- afs.c | 16 ++++++---------- server.ggo | 17 +++++++++++++++++ 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/afs.c b/afs.c index f6d6b8d7..33bc6e27 100644 --- a/afs.c +++ b/afs.c @@ -474,22 +474,18 @@ static void play_loop(enum play_mode current_play_mode) static enum play_mode init_admissible_files(void) { int ret; - char *given_mood, *given_playlist; - given_mood = "mood_that_was_given_at_the_command_line"; - given_playlist = "given_playlist"; - - if (given_mood) { - ret = change_current_mood(given_mood); + if (conf.mood_given) { + ret = change_current_mood(conf.mood_arg); if (ret >= 0) { - if (given_playlist) + if (conf.playlist_given) PARA_WARNING_LOG("ignoring playlist %s\n", - given_playlist); + conf.playlist_arg); return PLAY_MODE_MOOD; } } - if (given_playlist) { - ret = playlist_open(given_playlist); + if (conf.playlist_given) { + ret = playlist_open(conf.playlist_arg); if (ret >= 0) return PLAY_MODE_PLAYLIST; } diff --git a/server.ggo b/server.ggo index 54aea85a..f0e5bb04 100644 --- a/server.ggo +++ b/server.ggo @@ -156,6 +156,23 @@ 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" #~~~~~~~~~~~~~~~~~~~~~~~ -- 2.30.2