oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' of git://git.musicpd.org/romain/mpd

Browse Source
This commit is contained in:
Max Kellermann 2009-11-04 09:20:13 +01:00
commit c043bf0f63
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/mpdconf.example
View File

@ -49,6 +49,11 @@
# #
#state_file "~/.mpd/state" #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"
#
############################################################################### ###############################################################################

5
src/command.c
View File

@ -1597,6 +1597,7 @@ sticker_song_find_print_cb(struct song *song, const char *value,
static enum command_return static enum command_return
handle_sticker_song(struct client *client, int argc, char *argv[]) handle_sticker_song(struct client *client, int argc, char *argv[])
{ {
/* get song song_id key */
if (argc == 5 && strcmp(argv[1], "get") == 0) { if (argc == 5 && strcmp(argv[1], "get") == 0) {
struct song *song; struct song *song;
char *value; char *value;
@ -1619,6 +1620,7 @@ handle_sticker_song(struct client *client, int argc, char *argv[])
g_free(value); g_free(value);
return COMMAND_RETURN_OK; return COMMAND_RETURN_OK;
/* list song song_id */
} else if (argc == 4 && strcmp(argv[1], "list") == 0) { } else if (argc == 4 && strcmp(argv[1], "list") == 0) {
struct song *song; struct song *song;
struct sticker *sticker; struct sticker *sticker;
@ -1641,6 +1643,7 @@ handle_sticker_song(struct client *client, int argc, char *argv[])
sticker_free(sticker); sticker_free(sticker);
return COMMAND_RETURN_OK; return COMMAND_RETURN_OK;
/* set song song_id id key */
} else if (argc == 6 && strcmp(argv[1], "set") == 0) { } else if (argc == 6 && strcmp(argv[1], "set") == 0) {
struct song *song; struct song *song;
bool ret; bool ret;
@ -1660,6 +1663,7 @@ handle_sticker_song(struct client *client, int argc, char *argv[])
} }
return COMMAND_RETURN_OK; return COMMAND_RETURN_OK;
/* delete song song_id [key] */
} else if ((argc == 4 || argc == 5) && } else if ((argc == 4 || argc == 5) &&
strcmp(argv[1], "delete") == 0) { strcmp(argv[1], "delete") == 0) {
struct song *song; struct song *song;
@ -1682,6 +1686,7 @@ handle_sticker_song(struct client *client, int argc, char *argv[])
} }
return COMMAND_RETURN_OK; return COMMAND_RETURN_OK;
/* find song dir key */
} else if (argc == 5 && strcmp(argv[1], "find") == 0) { } else if (argc == 5 && strcmp(argv[1], "find") == 0) {
/* "sticker find song a/directory name" */ /* "sticker find song a/directory name" */
struct directory *directory; struct directory *directory;