diff options
| author | Romain Bignon <romain@peerfuse.org> | 2009-03-30 00:01:02 +0200 |
|---|---|---|
| committer | Romain Bignon <romain@peerfuse.org> | 2009-03-30 17:37:55 +0200 |
| commit | e81f683a1805871fa671485dc2a6327763ef1cf0 (patch) | |
| tree | b2fe3b82caf9b77dcabf2b475d10f34d20445a69 /src/command.c | |
| parent | 7d9380fd913355b70f846a4adc263363d12813ba (diff) | |
| download | mpd-e81f683a1805871fa671485dc2a6327763ef1cf0.tar.gz mpd-e81f683a1805871fa671485dc2a6327763ef1cf0.tar.xz mpd-e81f683a1805871fa671485dc2a6327763ef1cf0.zip | |
implemented the 'consume' mode
Consume mode removes each song played
Diffstat (limited to 'src/command.c')
| -rw-r--r-- | src/command.c | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/src/command.c b/src/command.c index 69fbe514f..d4363ff65 100644 --- a/src/command.c +++ b/src/command.c @@ -59,7 +59,8 @@ #define COMMAND_STATUS_VOLUME "volume" #define COMMAND_STATUS_STATE "state" #define COMMAND_STATUS_REPEAT "repeat" -#define COMMAND_STATUS_SINGLE "single" +#define COMMAND_STATUS_SINGLE "single" +#define COMMAND_STATUS_CONSUME "consume" #define COMMAND_STATUS_RANDOM "random" #define COMMAND_STATUS_PLAYLIST "playlist" #define COMMAND_STATUS_PLAYLIST_LENGTH "playlistlength" @@ -471,6 +472,7 @@ handle_status(struct client *client, COMMAND_STATUS_REPEAT ": %i\n" COMMAND_STATUS_RANDOM ": %i\n" COMMAND_STATUS_SINGLE ": %i\n" + COMMAND_STATUS_CONSUME ": %i\n" COMMAND_STATUS_PLAYLIST ": %li\n" COMMAND_STATUS_PLAYLIST_LENGTH ": %i\n" COMMAND_STATUS_CROSSFADE ": %i\n" @@ -479,6 +481,7 @@ handle_status(struct client *client, getPlaylistRepeatStatus(&g_playlist), getPlaylistRandomStatus(&g_playlist), getPlaylistSingleStatus(&g_playlist), + getPlaylistConsumeStatus(&g_playlist), getPlaylistVersion(&g_playlist), getPlaylistLength(&g_playlist), (int)(getPlayerCrossFade() + 0.5), @@ -1114,6 +1117,24 @@ handle_single(struct client *client, G_GNUC_UNUSED int argc, char *argv[]) } static enum command_return +handle_consume(struct client *client, G_GNUC_UNUSED int argc, char *argv[]) +{ + int status; + + if (!check_int(client, &status, argv[1], need_integer)) + return COMMAND_RETURN_ERROR; + + if (status != 0 && status != 1) { + command_error(client, ACK_ERROR_ARG, + "\"%i\" is not 0 or 1", status); + return COMMAND_RETURN_ERROR; + } + + setPlaylistConsumeStatus(&g_playlist, status); + return COMMAND_RETURN_OK; +} + +static enum command_return handle_random(struct client *client, G_GNUC_UNUSED int argc, char *argv[]) { int status; @@ -1573,6 +1594,7 @@ static const struct command commands[] = { { "clearerror", PERMISSION_CONTROL, 0, 0, handle_clearerror }, { "close", PERMISSION_NONE, -1, -1, handle_close }, { "commands", PERMISSION_NONE, 0, 0, handle_commands }, + { "consume", PERMISSION_CONTROL, 1, 1, handle_consume }, { "count", PERMISSION_READ, 2, -1, handle_count }, { "crossfade", PERMISSION_CONTROL, 1, 1, handle_crossfade }, { "currentsong", PERMISSION_READ, 0, 0, handle_currentsong }, |