X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fplayer_command.c;h=1a06bfabcb1b9b1bf465f883b9a02fd927bffba4;hb=2b171daac0ab6ac161514aeaa521fdd51e3f09c6;hp=3b8476daf3924b08aec875c17ac8c74f5a7c876e;hpb=ba6e36186aa8c6bd13d4162d6e16125b6616ace3;p=ncmpc.git diff --git a/src/player_command.c b/src/player_command.c index 3b8476d..1a06bfa 100644 --- a/src/player_command.c +++ b/src/player_command.c @@ -1,17 +1,17 @@ /* ncmpc (Ncurses MPD Client) - * (c) 2004-2009 The Music Player Daemon Project + * (c) 2004-2017 The Music Player Daemon Project * Project homepage: http://musicpd.org - + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -22,7 +22,7 @@ #include "options.h" #include "i18n.h" #include "screen_client.h" -#include "screen_message.h" +#include "screen_status.h" int seek_id = -1; int seek_target_time; @@ -32,18 +32,15 @@ static guint seek_source_id; static void commit_seek(struct mpdclient *c) { - struct mpd_connection *connection; - if (seek_id < 0) return; - if (!mpdclient_is_connected(c)) { + struct mpd_connection *connection = mpdclient_get_connection(c); + if (connection == NULL) { seek_id = -1; return; } - connection = mpdclient_get_connection(c); - if (c->song != NULL && (unsigned)seek_id == mpd_song_get_id(c->song)) if (!mpd_run_seek_id(connection, seek_id, seek_target_time)) mpdclient_handle_error(c); @@ -62,7 +59,6 @@ seek_timer(gpointer data) seek_source_id = 0; commit_seek(c); - mpdclient_put_connection(c); return false; } @@ -83,18 +79,33 @@ cancel_seek_timer(void) } } +static bool +setup_seek(struct mpdclient *c) +{ + if (!mpdclient_is_playing(c)) + return false; + + if (seek_id != (int)mpd_status_get_song_id(c->status)) { + seek_id = mpd_status_get_song_id(c->status); + seek_target_time = mpd_status_get_elapsed_time(c->status); + } + + schedule_seek_timer(c); + + return true; +} + bool handle_player_command(struct mpdclient *c, command_t cmd) { - struct mpd_connection *connection; - const struct mpd_song *song; - if (!mpdclient_is_connected(c) || c->status == NULL) return false; cancel_seek_timer(); switch(cmd) { + struct mpd_connection *connection; + /* case CMD_PLAY: mpdclient_cmd_play(c, MPD_PLAY_AT_BEGINNING); @@ -102,12 +113,18 @@ handle_player_command(struct mpdclient *c, command_t cmd) */ case CMD_PAUSE: connection = mpdclient_get_connection(c); + if (connection == NULL) + break; + if (!mpd_run_pause(connection, mpd_status_get_state(c->status) != MPD_STATE_PAUSE)) mpdclient_handle_error(c); break; case CMD_STOP: connection = mpdclient_get_connection(c); + if (connection == NULL) + break; + if (!mpd_run_stop(connection)) mpdclient_handle_error(c); break; @@ -115,79 +132,98 @@ handle_player_command(struct mpdclient *c, command_t cmd) mpdclient_cmd_crop(c); break; case CMD_SEEK_FORWARD: - song = mpdclient_get_current_song(c); - if (song != NULL) { - if (seek_id != (int)mpd_song_get_id(song)) { - seek_id = mpd_song_get_id(song); - seek_target_time = mpd_status_get_elapsed_time(c->status); - } - seek_target_time+=options.seek_time; - if (seek_target_time > (int)mpd_status_get_total_time(c->status)) - seek_target_time = mpd_status_get_total_time(c->status); - schedule_seek_timer(c); - } + if (!setup_seek(c)) + break; + + seek_target_time += options.seek_time; + if (seek_target_time > (int)mpd_status_get_total_time(c->status)) + seek_target_time = mpd_status_get_total_time(c->status); break; + case CMD_TRACK_NEXT: connection = mpdclient_get_connection(c); + if (connection == NULL) + break; + if (!mpd_run_next(connection)) mpdclient_handle_error(c); break; case CMD_SEEK_BACKWARD: - song = mpdclient_get_current_song(c); - if (song != NULL) { - if (seek_id != (int)mpd_song_get_id(song)) { - seek_id = mpd_song_get_id(c->song); - seek_target_time = mpd_status_get_elapsed_time(c->status); - } - seek_target_time-=options.seek_time; - if (seek_target_time < 0) - seek_target_time=0; - schedule_seek_timer(c); - } + if (!setup_seek(c)) + break; + + seek_target_time -= options.seek_time; + if (seek_target_time < 0) + seek_target_time = 0; break; + case CMD_TRACK_PREVIOUS: connection = mpdclient_get_connection(c); + if (connection == NULL) + break; + if (!mpd_run_previous(connection)) mpdclient_handle_error(c); break; case CMD_SHUFFLE: connection = mpdclient_get_connection(c); + if (connection == NULL) + break; + if (mpd_run_shuffle(connection)) - screen_status_message(_("Shuffled playlist")); + screen_status_message(_("Shuffled queue")); else mpdclient_handle_error(c); break; case CMD_CLEAR: connection = mpdclient_get_connection(c); + if (connection == NULL) + break; + if (mpdclient_cmd_clear(c)) - screen_status_message(_("Cleared playlist")); + screen_status_message(_("Cleared queue")); break; case CMD_REPEAT: connection = mpdclient_get_connection(c); + if (connection == NULL) + break; + if (!mpd_run_repeat(connection, !mpd_status_get_repeat(c->status))) mpdclient_handle_error(c); break; case CMD_RANDOM: connection = mpdclient_get_connection(c); + if (connection == NULL) + break; + if (!mpd_run_random(connection, !mpd_status_get_random(c->status))) mpdclient_handle_error(c); break; case CMD_SINGLE: connection = mpdclient_get_connection(c); + if (connection == NULL) + break; + if (!mpd_run_single(connection, !mpd_status_get_single(c->status))) mpdclient_handle_error(c); break; case CMD_CONSUME: connection = mpdclient_get_connection(c); + if (connection == NULL) + break; + if (!mpd_run_consume(connection, !mpd_status_get_consume(c->status))) mpdclient_handle_error(c); break; case CMD_CROSSFADE: connection = mpdclient_get_connection(c); + if (connection == NULL) + break; + if (!mpd_run_crossfade(connection, mpd_status_get_crossfade(c->status) > 0 ? 0 : options.crossfade_time))