X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fplayer_command.c;h=d4ff4ae280830e749adee8f1ce6ae01aaffc093f;hb=d4007f2eef7bf32498ad4233d8115c9e2c48b2c1;hp=085ffa14a478f0eba1f211954b7fd3653369c59d;hpb=aee38701de0938343fa23222c9b9aa876dbe8603;p=ncmpc.git diff --git a/src/player_command.c b/src/player_command.c index 085ffa1..d4ff4ae 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-2010 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. @@ -20,11 +20,9 @@ #include "player_command.h" #include "mpdclient.h" #include "options.h" -#include "screen.h" #include "i18n.h" #include "screen_client.h" - -#define IS_PAUSED(s) (s==MPD_STATE_PAUSE) +#include "screen_status.h" int seek_id = -1; int seek_target_time; @@ -37,8 +35,14 @@ commit_seek(struct mpdclient *c) if (seek_id < 0) return; + struct mpd_connection *connection = mpdclient_get_connection(c); + if (connection == NULL) { + seek_id = -1; + return; + } + if (c->song != NULL && (unsigned)seek_id == mpd_song_get_id(c->song)) - if (!mpd_run_seek_id(c->connection, seek_id, seek_target_time)) + if (!mpd_run_seek_id(connection, seek_id, seek_target_time)) mpdclient_handle_error(c); seek_id = -1; @@ -55,6 +59,7 @@ seek_timer(gpointer data) seek_source_id = 0; commit_seek(c); + mpdclient_put_connection(c); return false; } @@ -75,101 +80,152 @@ 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) { - const struct mpd_song *song; - - if (c->connection == NULL || c->status == NULL) + 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); break; */ case CMD_PAUSE: - if (!mpd_run_pause(c->connection, - !IS_PAUSED(mpd_status_get_state(c->status)))) + 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: - if (!mpd_run_stop(c->connection)) + connection = mpdclient_get_connection(c); + if (connection == NULL) + break; + + if (!mpd_run_stop(connection)) mpdclient_handle_error(c); break; case CMD_CROP: 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); - } - break; - /* fall through... */ + 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: - if (!mpd_run_next(c->connection)) + 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: - if (!mpd_run_previous(c->connection)) + connection = mpdclient_get_connection(c); + if (connection == NULL) + break; + + if (!mpd_run_previous(connection)) mpdclient_handle_error(c); break; case CMD_SHUFFLE: - if (mpd_run_shuffle(c->connection)) - screen_status_message(_("Shuffled playlist")); + connection = mpdclient_get_connection(c); + if (connection == NULL) + break; + + if (mpd_run_shuffle(connection)) + screen_status_message(_("Shuffled queue")); else mpdclient_handle_error(c); break; case CMD_CLEAR: - if (mpdclient_cmd_clear(c) == 0) - screen_status_message(_("Cleared playlist")); + connection = mpdclient_get_connection(c); + if (connection == NULL) + break; + + if (mpdclient_cmd_clear(c)) + screen_status_message(_("Cleared queue")); break; case CMD_REPEAT: - if (!mpd_run_repeat(c->connection, + 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: - if (!mpd_run_random(c->connection, + 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: - if (!mpd_run_single(c->connection, + 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: - if (!mpd_run_consume(c->connection, + 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: - if (!mpd_run_crossfade(c->connection, + 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)) mpdclient_handle_error(c);