diff options
author | Max Kellermann <max@duempel.org> | 2009-11-04 09:20:13 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2009-11-04 09:20:13 +0100 |
commit | c043bf0f6305876725f7686fc2a617a469f9cca1 (patch) | |
tree | 8f9dc74511db11a021b9c2d59934d5673ae7600d | |
parent | a22c93b659aceaefb0e72d0dedd554971455c02c (diff) | |
parent | 5744634094628bcf2637dae6998a9340818026f7 (diff) | |
download | mpd-c043bf0f6305876725f7686fc2a617a469f9cca1.tar.gz mpd-c043bf0f6305876725f7686fc2a617a469f9cca1.tar.xz mpd-c043bf0f6305876725f7686fc2a617a469f9cca1.zip |
Merge branch 'master' of git://git.musicpd.org/romain/mpd
Diffstat (limited to '')
-rw-r--r-- | doc/mpdconf.example | 5 | ||||
-rw-r--r-- | src/command.c | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/doc/mpdconf.example b/doc/mpdconf.example index 6da84fc37..1a0547094 100644 --- a/doc/mpdconf.example +++ b/doc/mpdconf.example @@ -49,6 +49,11 @@ # #state_file "~/.mpd/state" # +# The location of the sticker database. This is a database which +# manages dynamic information attached to songs. +# +#sticker_file "~/.mpd/sticker.sql" +# ############################################################################### diff --git a/src/command.c b/src/command.c index 38673f008..ba087dc45 100644 --- a/src/command.c +++ b/src/command.c @@ -1597,6 +1597,7 @@ sticker_song_find_print_cb(struct song *song, const char *value, static enum command_return handle_sticker_song(struct client *client, int argc, char *argv[]) { + /* get song song_id key */ if (argc == 5 && strcmp(argv[1], "get") == 0) { struct song *song; char *value; @@ -1619,6 +1620,7 @@ handle_sticker_song(struct client *client, int argc, char *argv[]) g_free(value); return COMMAND_RETURN_OK; + /* list song song_id */ } else if (argc == 4 && strcmp(argv[1], "list") == 0) { struct song *song; struct sticker *sticker; @@ -1641,6 +1643,7 @@ handle_sticker_song(struct client *client, int argc, char *argv[]) sticker_free(sticker); return COMMAND_RETURN_OK; + /* set song song_id id key */ } else if (argc == 6 && strcmp(argv[1], "set") == 0) { struct song *song; bool ret; @@ -1660,6 +1663,7 @@ handle_sticker_song(struct client *client, int argc, char *argv[]) } return COMMAND_RETURN_OK; + /* delete song song_id [key] */ } else if ((argc == 4 || argc == 5) && strcmp(argv[1], "delete") == 0) { struct song *song; @@ -1682,6 +1686,7 @@ handle_sticker_song(struct client *client, int argc, char *argv[]) } return COMMAND_RETURN_OK; + /* find song dir key */ } else if (argc == 5 && strcmp(argv[1], "find") == 0) { /* "sticker find song a/directory name" */ struct directory *directory; |