diff --git a/src/mpdclient.c b/src/mpdclient.c
index a82278a47be1f3217be5fddd04f84a0d79836216..ec058061546c23cf1033076d220b267745ff2949 100644 (file)
--- a/src/mpdclient.c
+++ b/src/mpdclient.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 "mpdclient.h"
#include "filelist.h"
return false;
}
-static bool
-mpdclient_finish_command(struct mpdclient *c)
-{
- return mpd_response_finish(c->connection)
- ? true : mpdclient_handle_error(c);
-}
-
struct mpdclient *
mpdclient_new(void)
{
c->song = NULL;
/* everything has changed after a disconnect */
- c->events |= MPD_IDLE_DATABASE|MPD_IDLE_STORED_PLAYLIST|
- MPD_IDLE_QUEUE|MPD_IDLE_PLAYER|MPD_IDLE_MIXER|MPD_IDLE_OUTPUT|
- MPD_IDLE_OPTIONS|MPD_IDLE_UPDATE;
+ c->events |= MPD_IDLE_ALL;
}
bool
mpdclient_connect(struct mpdclient *c,
const gchar *host,
gint port,
- gfloat _timeout,
+ unsigned timeout_ms,
const gchar *password)
{
/* close any open connection */
- if( c->connection )
+ if (c->connection)
mpdclient_disconnect(c);
/* connect to MPD */
- c->connection = mpd_connection_new(host, port, _timeout * 1000);
+ c->connection = mpd_connection_new(host, port, timeout_ms);
if (c->connection == NULL)
g_error("Out of memory");
mpdclient_update(struct mpdclient *c)
{
struct mpd_connection *connection = mpdclient_get_connection(c);
- bool retval;
c->volume = -1;
/* check if the playlist needs an update */
if (c->playlist.version != mpd_status_get_queue_version(c->status)) {
+ bool retval;
+
if (c->source == NULL)
- c->events |= MPD_IDLE_PLAYLIST;
+ c->events |= MPD_IDLE_QUEUE;
if (!playlist_is_empty(&c->playlist))
retval = mpdclient_playlist_update_changes(c);
else
retval = mpdclient_playlist_update(c);
- } else
- retval = true;
+ if (!retval)
+ return false;
+ }
/* update the current song */
- if (!c->song || mpd_status_get_song_id(c->status)) {
+ if (!c->song || mpd_status_get_song_id(c->status) >= 0) {
c->song = playlist_get_song(&c->playlist,
mpd_status_get_song_pos(c->status));
}
- return retval;
+ return true;
}
struct mpd_connection *
assert(c->source == NULL || c->connection != NULL);
if (c->source != NULL && !c->idle) {
- c->idle = true;
- mpd_glib_enter(c->source);
+ c->idle = mpd_glib_enter(c->source);
}
}
-
-/****************************************************************************/
-/*** MPD Commands **********************************************************/
-/****************************************************************************/
-
-bool
-mpdclient_cmd_play(struct mpdclient *c, gint idx)
+static struct mpd_status *
+mpdclient_recv_status(struct mpdclient *c)
{
- struct mpd_connection *connection = mpdclient_get_connection(c);
- const struct mpd_song *song = playlist_get_song(&c->playlist, idx);
+ struct mpd_status *status;
- if (connection == NULL)
- return false;
+ assert(c->connection != NULL);
- if (song)
- mpd_send_play_id(connection, mpd_song_get_id(song));
- else
- mpd_send_play(connection);
+ status = mpd_recv_status(c->connection);
+ if (status == NULL) {
+ mpdclient_handle_error(c);
+ return NULL;
+ }
- return mpdclient_finish_command(c);
+ if (c->status != NULL)
+ mpd_status_free(c->status);
+ return c->status = status;
}
+/****************************************************************************/
+/*** MPD Commands **********************************************************/
+/****************************************************************************/
+
bool
mpdclient_cmd_crop(struct mpdclient *c)
{
- struct mpd_connection *connection = mpdclient_get_connection(c);
- struct mpd_status *status;
- bool playing;
+ struct mpd_connection *connection;
int length, current;
- if (connection == NULL)
+ if (!mpdclient_is_playing(c))
return false;
- status = mpd_run_status(connection);
- if (status == NULL)
- return mpdclient_handle_error(c);
-
- playing = mpd_status_get_state(status) == MPD_STATE_PLAY ||
- mpd_status_get_state(status) == MPD_STATE_PAUSE;
- length = mpd_status_get_queue_length(status);
- current = mpd_status_get_song_pos(status);
-
- mpd_status_free(status);
-
- if (!playing || length < 2)
+ length = mpd_status_get_queue_length(c->status);
+ current = mpd_status_get_song_pos(c->status);
+ if (current < 0 || mpd_status_get_queue_length(c->status) < 2)
return true;
+ connection = mpdclient_get_connection(c);
+ if (connection == NULL)
+ return false;
+
mpd_command_list_begin(connection, false);
- while (--length >= 0)
- if (length != current)
- mpd_send_delete(connection, length);
+ if (mpd_connection_cmp_server_version(connection, 0, 16, 0) >= 0) {
+ if (current < length - 1)
+ mpd_send_delete_range(connection, current + 1, length);
+ if (current > 0)
+ mpd_send_delete_range(connection, 0, current);
+ } else
+ while (--length >= 0)
+ if (length != current)
+ mpd_send_delete(connection, length);
mpd_command_list_end(connection);
mpdclient_cmd_clear(struct mpdclient *c)
{
struct mpd_connection *connection = mpdclient_get_connection(c);
- bool retval;
+ struct mpd_status *status;
if (connection == NULL)
return false;
- mpd_send_clear(connection);
- retval = mpdclient_finish_command(c);
+ /* send "clear" and "status" */
+ if (!mpd_command_list_begin(connection, false) ||
+ !mpd_send_clear(connection) ||
+ !mpd_send_status(connection) ||
+ !mpd_command_list_end(connection))
+ return mpdclient_handle_error(c);
+
+ /* receive the new status, store it in the mpdclient struct */
+
+ status = mpdclient_recv_status(c);
+ if (status == NULL)
+ return false;
+
+ if (!mpd_response_finish(connection))
+ return mpdclient_handle_error(c);
- if (retval)
- c->events |= MPD_IDLE_PLAYLIST;
+ /* update mpdclient.playlist */
+
+ if (mpd_status_get_queue_length(status) == 0) {
+ /* after the "clear" command, the queue is really
+ empty - this means we can clear it locally,
+ reducing the UI latency */
+ playlist_clear(&c->playlist);
+ c->playlist.version = mpd_status_get_queue_version(status);
+ c->song = NULL;
+ }
- return retval;
+ c->events |= MPD_IDLE_QUEUE;
+ return true;
}
bool
if (connection == NULL)
return false;
- mpd_send_add(connection, path_utf8);
- return mpdclient_finish_command(c);
+ return mpd_send_add(connection, path_utf8)?
+ mpdclient_finish_command(c) : false;
}
bool
!mpd_response_next(connection))
return mpdclient_handle_error(c);
- c->events |= MPD_IDLE_PLAYLIST;
+ c->events |= MPD_IDLE_QUEUE;
- status = mpd_recv_status(connection);
- if (status != NULL) {
- if (c->status != NULL)
- mpd_status_free(c->status);
- c->status = status;
- }
+ status = mpdclient_recv_status(c);
+ if (status == NULL)
+ return false;
if (!mpd_response_next(connection))
return mpdclient_handle_error(c);
!mpd_command_list_end(connection))
return mpdclient_handle_error(c);
- c->events |= MPD_IDLE_PLAYLIST;
+ c->events |= MPD_IDLE_QUEUE;
- status = mpd_recv_status(connection);
- if (status != NULL) {
- if (c->status != NULL)
- mpd_status_free(c->status);
- c->status = status;
- }
+ status = mpdclient_recv_status(c);
+ if (status == NULL)
+ return false;
if (!mpd_response_finish(connection))
return mpdclient_handle_error(c);
struct mpd_connection *connection;
struct mpd_status *status;
+ if (end == start + 1)
+ /* if that's not really a range, we choose to use the
+ safer "deleteid" version */
+ return mpdclient_cmd_delete(c, start);
+
connection = mpdclient_get_connection(c);
if (connection == NULL)
return false;
!mpd_command_list_end(connection))
return mpdclient_handle_error(c);
- c->events |= MPD_IDLE_PLAYLIST;
+ c->events |= MPD_IDLE_QUEUE;
- status = mpd_recv_status(connection);
- if (status != NULL) {
- if (c->status != NULL)
- mpd_status_free(c->status);
- c->status = status;
- }
+ status = mpdclient_recv_status(c);
+ if (status == NULL)
+ return false;
if (!mpd_response_finish(connection))
return mpdclient_handle_error(c);
}
bool
-mpdclient_cmd_move(struct mpdclient *c, gint old_index, gint new_index)
+mpdclient_cmd_move(struct mpdclient *c, unsigned dest_pos, unsigned src_pos)
{
- struct mpd_connection *connection = mpdclient_get_connection(c);
- const struct mpd_song *song1, *song2;
+ struct mpd_connection *connection;
struct mpd_status *status;
- if (connection == NULL)
- return false;
+ if (dest_pos == src_pos)
+ return true;
- if (old_index == new_index || new_index < 0 ||
- (guint)new_index >= c->playlist.list->len)
+ connection = mpdclient_get_connection(c);
+ if (connection == NULL)
return false;
- song1 = playlist_get(&c->playlist, old_index);
- song2 = playlist_get(&c->playlist, new_index);
-
- /* send the delete command to mpd; at the same time, get the
+ /* send the "move" command to MPD; at the same time, get the
new status (to verify the playlist id) */
if (!mpd_command_list_begin(connection, false) ||
- !mpd_send_swap_id(connection, mpd_song_get_id(song1),
- mpd_song_get_id(song2)) ||
+ !mpd_send_move(connection, src_pos, dest_pos) ||
!mpd_send_status(connection) ||
!mpd_command_list_end(connection))
return mpdclient_handle_error(c);
- c->events |= MPD_IDLE_PLAYLIST;
+ c->events |= MPD_IDLE_QUEUE;
- status = mpd_recv_status(connection);
- if (status != NULL) {
- if (c->status != NULL)
- mpd_status_free(c->status);
- c->status = status;
- }
+ status = mpdclient_recv_status(c);
+ if (status == NULL)
+ return false;
if (!mpd_response_finish(connection))
return mpdclient_handle_error(c);
c->playlist.version = mpd_status_get_queue_version(status);
/* swap songs in the local playlist */
- playlist_swap(&c->playlist, old_index, new_index);
+ playlist_move(&c->playlist, dest_pos, src_pos);
}
return true;
mpd_command_list_end(connection);
return mpdclient_finish_command(c);
}
-
-GList *
-mpdclient_get_artists(struct mpdclient *c)
-{
- struct mpd_connection *connection = mpdclient_get_connection(c);
- GList *list = NULL;
- struct mpd_pair *pair;
-
- if (connection == NULL)
- return NULL;
-
- mpd_search_db_tags(connection, MPD_TAG_ARTIST);
- mpd_search_commit(connection);
-
- while ((pair = mpd_recv_pair_tag(connection,
- MPD_TAG_ARTIST)) != NULL) {
- list = g_list_append(list, g_strdup(pair->value));
- mpd_return_pair(connection, pair);
- }
-
- if (!mpdclient_finish_command(c))
- return string_list_free(list);
-
- return list;
-}
-
-GList *
-mpdclient_get_albums(struct mpdclient *c, const gchar *artist_utf8)
-{
- struct mpd_connection *connection = mpdclient_get_connection(c);
- GList *list = NULL;
- struct mpd_pair *pair;
-
- if (connection == NULL)
- return NULL;
-
- mpd_search_db_tags(connection, MPD_TAG_ALBUM);
- if (artist_utf8 != NULL)
- mpd_search_add_tag_constraint(connection,
- MPD_OPERATOR_DEFAULT,
- MPD_TAG_ARTIST, artist_utf8);
- mpd_search_commit(connection);
-
- while ((pair = mpd_recv_pair_tag(connection,
- MPD_TAG_ALBUM)) != NULL) {
- list = g_list_append(list, g_strdup(pair->value));
- mpd_return_pair(connection, pair);
- }
-
- if (!mpdclient_finish_command(c))
- return string_list_free(list);
-
- return list;
-}