![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/player_command.c b/src/player_command.c
index 678d13a07343232d380ee004dd891ebefa6351fc..2455c83e58cdb74b5645730c0a91590c5c0e073b 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
#include "player_command.h"
#include "mpdclient.h"
#include "options.h"
-#include "screen.h"
#include "i18n.h"
#include "screen_client.h"
-
-#define IS_PLAYING(s) (s==MPD_STATE_PLAY)
-#define IS_PAUSED(s) (s==MPD_STATE_PAUSE)
-#define IS_STOPPED(s) (!(IS_PLAYING(s) | IS_PAUSED(s)))
+#include "screen_message.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);
+ if (connection == NULL) {
+ seek_id = -1;
+ return;
+ }
+
if (c->song != NULL && (unsigned)seek_id == mpd_song_get_id(c->song))
- mpdclient_cmd_seek(c, seek_id, seek_target_time);
+ if (!mpd_run_seek_id(connection, seek_id, seek_target_time))
+ mpdclient_handle_error(c);
seek_id = -1;
}
seek_source_id = 0;
commit_seek(c);
+ mpdclient_put_connection(c);
return false;
}
}
}
+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)
{
- if (c->connection == NULL || c->status == NULL)
+ struct mpd_connection *connection;
+
+ if (!mpdclient_is_connected(c) || c->status == NULL)
return false;
cancel_seek_timer();
break;
*/
case CMD_PAUSE:
- mpdclient_cmd_pause(c, !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:
- mpdclient_cmd_stop(c);
+ 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:
- if (!IS_STOPPED(mpd_status_get_state(c->status))) {
- if (c->song != NULL &&
- seek_id != (int)mpd_song_get_id(c->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 > (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 (!IS_STOPPED(mpd_status_get_state(c->status)))
- mpdclient_cmd_next(c);
+ connection = mpdclient_get_connection(c);
+ if (connection == NULL)
+ break;
+
+ if (!mpd_run_next(connection))
+ mpdclient_handle_error(c);
break;
case CMD_SEEK_BACKWARD:
- if (!IS_STOPPED(mpd_status_get_state(c->status))) {
- if (seek_id != (int)mpd_song_get_id(c->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 (!IS_STOPPED(mpd_status_get_state(c->status)))
- mpdclient_cmd_prev(c);
+ connection = mpdclient_get_connection(c);
+ if (connection == NULL)
+ break;
+
+ if (!mpd_run_previous(connection))
+ mpdclient_handle_error(c);
break;
case CMD_SHUFFLE:
- if (mpdclient_cmd_shuffle(c) == 0)
+ connection = mpdclient_get_connection(c);
+ if (connection == NULL)
+ break;
+
+ if (mpd_run_shuffle(connection))
screen_status_message(_("Shuffled playlist"));
+ else
+ mpdclient_handle_error(c);
break;
case CMD_CLEAR:
- if (mpdclient_cmd_clear(c) == 0)
+ connection = mpdclient_get_connection(c);
+ if (connection == NULL)
+ break;
+
+ if (mpdclient_cmd_clear(c))
screen_status_message(_("Cleared playlist"));
break;
case CMD_REPEAT:
- mpdclient_cmd_repeat(c, !mpd_status_get_repeat(c->status));
+ 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:
- mpdclient_cmd_random(c, !mpd_status_get_random(c->status));
+ 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:
- mpdclient_cmd_single(c, !mpd_status_get_single(c->status));
+ 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:
- mpdclient_cmd_consume(c, !mpd_status_get_consume(c->status));
+ 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_status_get_crossfade(c->status))
- mpdclient_cmd_crossfade(c, 0);
- else
- mpdclient_cmd_crossfade(c, options.crossfade_time);
+ 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);
break;
case CMD_DB_UPDATE:
screen_database_update(c, NULL);