diff --git a/src/player_command.c b/src/player_command.c
index 505d2fc596d47709089fbb4bef3cbda925a3a1d5..d4ff4ae280830e749adee8f1ce6ae01aaffc093f 100644 (file)
--- a/src/player_command.c
+++ b/src/player_command.c
/* 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.
#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;
static void
commit_seek(struct mpdclient *c)
{
- struct mpd_connection *connection;
-
if (seek_id < 0)
return;
- connection = mpdclient_get_connection(c);
+ struct mpd_connection *connection = mpdclient_get_connection(c);
if (connection == NULL) {
seek_id = -1;
return;
static bool
setup_seek(struct mpdclient *c)
{
- const struct mpd_song *song;
-
- song = mpdclient_get_current_song(c);
- if (song == NULL)
+ if (!mpdclient_is_playing(c))
return false;
- if (seek_id != (int)mpd_song_get_id(song)) {
- seek_id = mpd_song_get_id(song);
+ 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);
}
bool
handle_player_command(struct mpdclient *c, command_t cmd)
{
- struct mpd_connection *connection;
-
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;
if (mpd_run_shuffle(connection))
- screen_status_message(_("Shuffled playlist"));
+ screen_status_message(_("Shuffled queue"));
else
mpdclient_handle_error(c);
break;
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);