Change syntax for selecting moods or playlists.

Use m/foo, p/bar instead of m:foo and p:bar. This is much friendlier
to bash completion.

diff --git a/afs.c b/afs.c
index ac7884c7e4e4c959a3ce3b1c17d050705a70b394..295933ec545d7eb60673e8dd002257347730e686 100644 (file)
--- a/afs.c
+++ b/afs.c
@@ -527,10 +527,10 @@ static int activate_mood_or_playlist(char *arg, int *num_admissible)
                ret = change_current_mood(NULL); /* always successful */
                mode = PLAY_MODE_MOOD;
        } else {
-               if (!strncmp(arg, "p:", 2)) {
+               if (!strncmp(arg, "p/", 2)) {
                        ret = playlist_open(arg + 2);
                        mode = PLAY_MODE_PLAYLIST;
-               } else if (!strncmp(arg, "m:", 2)) {
+               } else if (!strncmp(arg, "m/", 2)) {
                        ret = change_current_mood(arg + 2);
                        mode = PLAY_MODE_MOOD;
                } else

diff --git a/server.ggo b/server.ggo
index 650dcf0e69634ee25a0c9de8154e4a0130ba8e49..95e81b37839a76fcc0428492579e8e199fa58c60 100644 (file)
--- a/server.ggo
+++ b/server.ggo
@@ -160,17 +160,16 @@ option "afs_initial_mode" i
 #~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 "Mood or playlist to load on startup. Must be
-prefixed with either 'p:' or 'm:' to indicate
+prefixed with either 'p/' or 'm/' to indicate
 whether a playlist or a mood should be
 loaded. Example:
-       --afs_initial_mode p:foo
+       --afs_initial_mode p/foo
 loads the playlist named 'foo'."
 
-       string typestr="aspecifier>:<name>"
+       string typestr="<specifier>/<name>"
        optional
 
 
-
 section "http sender"
 #~~~~~~~~~~~~~~~~~~~~