![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/mpdclient.c b/src/mpdclient.c
index 1abc529a018e1024d62be5381d821322ffaae8e4..7bf29ea921e20dbda7aae906e7754aaf979e1f20 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
#include "options.h"
#include "strfsong.h"
#include "utils.h"
+#include "gidle.h"
#include <mpd/client.h>
#define BUFSIZE 1024
-static bool
-MPD_ERROR(const struct mpdclient *client)
-{
- return !mpdclient_is_connected(client) ||
- mpd_connection_get_error(client->connection) != MPD_ERROR_SUCCESS;
-}
-
/* sort by list-format */
gint
compare_filelistentry_format(gconstpointer filelist_entry1,
void
mpdclient_disconnect(struct mpdclient *c)
{
+ if (c->source != NULL) {
+ mpd_glib_free(c->source);
+ c->source = NULL;
+ c->idle = false;
+ }
+
if (c->connection)
mpd_connection_free(c->connection);
c->connection = NULL;
if (c->song)
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;
}
bool
bool
mpdclient_update(struct mpdclient *c)
{
- bool retval;
+ struct mpd_connection *connection = mpdclient_get_connection(c);
c->volume = -1;
- if (MPD_ERROR(c))
+ if (connection == NULL)
return false;
- /* always announce these options as long as we don't have real
+ /* always announce these options as long as we don't have
"idle" support */
- c->events |= MPD_IDLE_PLAYER|MPD_IDLE_OPTIONS;
+ if (c->source == NULL)
+ c->events |= MPD_IDLE_PLAYER|MPD_IDLE_OPTIONS;
/* free the old status */
if (c->status)
mpd_status_free(c->status);
/* retrieve new status */
- c->status = mpd_run_status(c->connection);
+ c->status = mpd_run_status(connection);
if (c->status == NULL)
return mpdclient_handle_error(c);
- if (c->update_id != mpd_status_get_update_id(c->status)) {
+ if (c->source == NULL &&
+ c->update_id != mpd_status_get_update_id(c->status)) {
c->events |= MPD_IDLE_UPDATE;
if (c->update_id > 0)
c->update_id = mpd_status_get_update_id(c->status);
- if (c->volume != mpd_status_get_volume(c->status))
+ if (c->source == NULL &&
+ c->volume != mpd_status_get_volume(c->status))
c->events |= MPD_IDLE_MIXER;
c->volume = mpd_status_get_volume(c->status);
/* check if the playlist needs an update */
if (c->playlist.version != mpd_status_get_queue_version(c->status)) {
- c->events |= MPD_IDLE_PLAYLIST;
+ bool retval;
+
+ if (c->source == NULL)
+ 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 *
+mpdclient_get_connection(struct mpdclient *c)
+{
+ if (c->source != NULL && c->idle) {
+ c->idle = false;
+ mpd_glib_leave(c->source);
+ }
-/****************************************************************************/
-/*** MPD Commands **********************************************************/
-/****************************************************************************/
+ return c->connection;
+}
-bool
-mpdclient_cmd_play(struct mpdclient *c, gint idx)
+void
+mpdclient_put_connection(struct mpdclient *c)
{
- const struct mpd_song *song = playlist_get_song(&c->playlist, idx);
+ assert(c->source == NULL || c->connection != NULL);
- if (MPD_ERROR(c))
- return false;
+ if (c->source != NULL && !c->idle) {
+ c->idle = mpd_glib_enter(c->source);
+ }
+}
+
+static struct mpd_status *
+mpdclient_recv_status(struct mpdclient *c)
+{
+ struct mpd_status *status;
- if (song)
- mpd_send_play_id(c->connection, mpd_song_get_id(song));
- else
- mpd_send_play(c->connection);
+ assert(c->connection != NULL);
- return mpdclient_finish_command(c);
+ status = mpd_recv_status(c->connection);
+ if (status == NULL) {
+ mpdclient_handle_error(c);
+ return NULL;
+ }
+
+ if (c->status != NULL)
+ mpd_status_free(c->status);
+ return c->status = status;
}
+/****************************************************************************/
+/*** MPD Commands **********************************************************/
+/****************************************************************************/
+
bool
mpdclient_cmd_crop(struct mpdclient *c)
{
- struct mpd_status *status;
- bool playing;
+ struct mpd_connection *connection;
int length, current;
- if (MPD_ERROR(c))
+ if (!mpdclient_is_playing(c))
return false;
- status = mpd_run_status(c->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;
- mpd_command_list_begin(c->connection, false);
+ 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(c->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(c->connection);
+ mpd_command_list_end(connection);
return mpdclient_finish_command(c);
}
bool
mpdclient_cmd_clear(struct mpdclient *c)
{
- bool retval;
+ struct mpd_connection *connection = mpdclient_get_connection(c);
+ struct mpd_status *status;
- if (MPD_ERROR(c))
+ if (connection == NULL)
return false;
- mpd_send_clear(c->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);
- if (retval)
- c->events |= MPD_IDLE_PLAYLIST;
+ /* receive the new status, store it in the mpdclient struct */
- return retval;
+ status = mpdclient_recv_status(c);
+ if (status == NULL)
+ return false;
+
+ if (!mpd_response_finish(connection))
+ return mpdclient_handle_error(c);
+
+ /* 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->events |= MPD_IDLE_QUEUE;
+ return true;
}
bool
mpdclient_cmd_volume(struct mpdclient *c, gint value)
{
- if (MPD_ERROR(c))
+ struct mpd_connection *connection = mpdclient_get_connection(c);
+ if (connection == NULL)
return false;
- mpd_send_set_volume(c->connection, value);
+ mpd_send_set_volume(connection, value);
return mpdclient_finish_command(c);
}
bool
mpdclient_cmd_volume_up(struct mpdclient *c)
{
- if (MPD_ERROR(c))
+ struct mpd_connection *connection = mpdclient_get_connection(c);
+ if (connection == NULL)
return false;
if (c->status == NULL ||
bool
mpdclient_cmd_volume_down(struct mpdclient *c)
{
- if (MPD_ERROR(c))
+ struct mpd_connection *connection = mpdclient_get_connection(c);
+ if (connection == NULL)
return false;
if (c->status == NULL || mpd_status_get_volume(c->status) < 0)
bool
mpdclient_cmd_add_path(struct mpdclient *c, const gchar *path_utf8)
{
- if (MPD_ERROR(c))
+ struct mpd_connection *connection = mpdclient_get_connection(c);
+ if (connection == NULL)
return false;
- mpd_send_add(c->connection, path_utf8);
+ mpd_send_add(connection, path_utf8);
return mpdclient_finish_command(c);
}
bool
mpdclient_cmd_add(struct mpdclient *c, const struct mpd_song *song)
{
+ struct mpd_connection *connection = mpdclient_get_connection(c);
struct mpd_status *status;
struct mpd_song *new_song;
assert(c != NULL);
assert(song != NULL);
- if (MPD_ERROR(c) || c->status == NULL)
+ if (connection == NULL || c->status == NULL)
return false;
/* send the add command to mpd; at the same time, get the new
status (to verify the new playlist id) and the last song
(we hope that's the song we just added) */
- if (!mpd_command_list_begin(c->connection, true) ||
- !mpd_send_add(c->connection, mpd_song_get_uri(song)) ||
- !mpd_send_status(c->connection) ||
- !mpd_send_get_queue_song_pos(c->connection,
+ if (!mpd_command_list_begin(connection, true) ||
+ !mpd_send_add(connection, mpd_song_get_uri(song)) ||
+ !mpd_send_status(connection) ||
+ !mpd_send_get_queue_song_pos(connection,
playlist_length(&c->playlist)) ||
- !mpd_command_list_end(c->connection) ||
- !mpd_response_next(c->connection))
+ !mpd_command_list_end(connection) ||
+ !mpd_response_next(connection))
return mpdclient_handle_error(c);
- c->events |= MPD_IDLE_PLAYLIST;
+ c->events |= MPD_IDLE_QUEUE;
- status = mpd_recv_status(c->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(c->connection))
+ if (!mpd_response_next(connection))
return mpdclient_handle_error(c);
- new_song = mpd_recv_song(c->connection);
- if (!mpd_response_finish(c->connection) || new_song == NULL) {
+ new_song = mpd_recv_song(connection);
+ if (!mpd_response_finish(connection) || new_song == NULL) {
if (new_song != NULL)
mpd_song_free(new_song);
- return mpd_connection_clear_error(c->connection) ||
+ return mpd_connection_clear_error(connection) ||
mpdclient_handle_error(c);
}
bool
mpdclient_cmd_delete(struct mpdclient *c, gint idx)
{
+ struct mpd_connection *connection = mpdclient_get_connection(c);
const struct mpd_song *song;
struct mpd_status *status;
- if (MPD_ERROR(c) || c->status == NULL)
+ if (connection == NULL || c->status == NULL)
return false;
if (idx < 0 || (guint)idx >= playlist_length(&c->playlist))
/* send the delete command to mpd; at the same time, get the
new status (to verify the playlist id) */
- if (!mpd_command_list_begin(c->connection, false) ||
- !mpd_send_delete_id(c->connection, mpd_song_get_id(song)) ||
- !mpd_send_status(c->connection) ||
- !mpd_command_list_end(c->connection))
+ if (!mpd_command_list_begin(connection, false) ||
+ !mpd_send_delete_id(connection, mpd_song_get_id(song)) ||
+ !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(c->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(c->connection))
+ if (!mpd_response_finish(connection))
return mpdclient_handle_error(c);
if (mpd_status_get_queue_length(status) == playlist_length(&c->playlist) - 1 &&
mpdclient_cmd_delete_range_fallback(struct mpdclient *c,
unsigned start, unsigned end)
{
- if (!mpd_command_list_begin(c->connection, false))
+ struct mpd_connection *connection = mpdclient_get_connection(c);
+ if (connection == NULL)
+ return false;
+
+ if (!mpd_command_list_begin(connection, false))
return mpdclient_handle_error(c);
for (; start < end; --end)
- mpd_send_delete(c->connection, start);
+ mpd_send_delete(connection, start);
- if (!mpd_command_list_end(c->connection) ||
- !mpd_response_finish(c->connection))
+ if (!mpd_command_list_end(connection) ||
+ !mpd_response_finish(connection))
return mpdclient_handle_error(c);
return true;
bool
mpdclient_cmd_delete_range(struct mpdclient *c, unsigned start, unsigned end)
{
+ struct mpd_connection *connection;
struct mpd_status *status;
- if (MPD_ERROR(c))
+ 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;
- if (mpd_connection_cmp_server_version(c->connection, 0, 16, 0) < 0)
+ if (mpd_connection_cmp_server_version(connection, 0, 16, 0) < 0)
return mpdclient_cmd_delete_range_fallback(c, start, end);
/* MPD 0.16 supports "delete" with a range argument */
/* send the delete command to mpd; at the same time, get the
new status (to verify the playlist id) */
- if (!mpd_command_list_begin(c->connection, false) ||
- !mpd_send_delete_range(c->connection, start, end) ||
- !mpd_send_status(c->connection) ||
- !mpd_command_list_end(c->connection))
+ if (!mpd_command_list_begin(connection, false) ||
+ !mpd_send_delete_range(connection, start, end) ||
+ !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(c->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(c->connection))
+ if (!mpd_response_finish(connection))
return mpdclient_handle_error(c);
if (mpd_status_get_queue_length(status) == playlist_length(&c->playlist) - (end - start) &&
}
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)
{
- const struct mpd_song *song1, *song2;
+ struct mpd_connection *connection;
struct mpd_status *status;
- if (MPD_ERROR(c))
- 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(c->connection, false) ||
- !mpd_send_swap_id(c->connection, mpd_song_get_id(song1),
- mpd_song_get_id(song2)) ||
- !mpd_send_status(c->connection) ||
- !mpd_command_list_end(c->connection))
+ if (!mpd_command_list_begin(connection, false) ||
+ !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(c->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(c->connection))
+ if (!mpd_response_finish(connection))
return mpdclient_handle_error(c);
if (mpd_status_get_queue_length(status) == playlist_length(&c->playlist) &&
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;
bool
mpdclient_playlist_update(struct mpdclient *c)
{
+ struct mpd_connection *connection = mpdclient_get_connection(c);
struct mpd_entity *entity;
- if (MPD_ERROR(c))
+ if (connection == NULL)
return false;
playlist_clear(&c->playlist);
- mpd_send_list_queue_meta(c->connection);
- while ((entity = mpd_recv_entity(c->connection))) {
+ mpd_send_list_queue_meta(connection);
+ while ((entity = mpd_recv_entity(connection))) {
if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_SONG)
playlist_append(&c->playlist, mpd_entity_get_song(entity));
bool
mpdclient_playlist_update_changes(struct mpdclient *c)
{
+ struct mpd_connection *connection = mpdclient_get_connection(c);
struct mpd_song *song;
guint length;
- if (MPD_ERROR(c))
+ if (connection == NULL)
return false;
- mpd_send_queue_changes_meta(c->connection, c->playlist.version);
+ mpd_send_queue_changes_meta(connection, c->playlist.version);
- while ((song = mpd_recv_song(c->connection)) != NULL) {
+ while ((song = mpd_recv_song(connection)) != NULL) {
int pos = mpd_song_get_pos(song);
if (pos >= 0 && (guint)pos < c->playlist.list->len) {
bool
mpdclient_filelist_add_all(struct mpdclient *c, struct filelist *fl)
{
+ struct mpd_connection *connection = mpdclient_get_connection(c);
guint i;
- if (MPD_ERROR(c))
+ if (connection == NULL)
return false;
if (filelist_is_empty(fl))
return true;
- mpd_command_list_begin(c->connection, false);
+ mpd_command_list_begin(connection, false);
for (i = 0; i < filelist_length(fl); ++i) {
struct filelist_entry *entry = filelist_get(fl, i);
const struct mpd_song *song =
mpd_entity_get_song(entity);
- mpd_send_add(c->connection, mpd_song_get_uri(song));
+ mpd_send_add(connection, mpd_song_get_uri(song));
}
}
- mpd_command_list_end(c->connection);
+ mpd_command_list_end(connection);
return mpdclient_finish_command(c);
}
-
-GList *
-mpdclient_get_artists(struct mpdclient *c)
-{
- GList *list = NULL;
- struct mpd_pair *pair;
-
- if (MPD_ERROR(c))
- return NULL;
-
- mpd_search_db_tags(c->connection, MPD_TAG_ARTIST);
- mpd_search_commit(c->connection);
-
- while ((pair = mpd_recv_pair_tag(c->connection,
- MPD_TAG_ARTIST)) != NULL) {
- list = g_list_append(list, g_strdup(pair->value));
- mpd_return_pair(c->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)
-{
- GList *list = NULL;
- struct mpd_pair *pair;
-
- if (MPD_ERROR(c))
- return NULL;
-
- mpd_search_db_tags(c->connection, MPD_TAG_ALBUM);
- if (artist_utf8 != NULL)
- mpd_search_add_tag_constraint(c->connection,
- MPD_OPERATOR_DEFAULT,
- MPD_TAG_ARTIST, artist_utf8);
- mpd_search_commit(c->connection);
-
- while ((pair = mpd_recv_pair_tag(c->connection,
- MPD_TAG_ALBUM)) != NULL) {
- list = g_list_append(list, g_strdup(pair->value));
- mpd_return_pair(c->connection, pair);
- }
-
- if (!mpdclient_finish_command(c))
- return string_list_free(list);
-
- return list;
-}