![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/mpdclient.c b/src/mpdclient.c
index 20248215f3c566b48ebf220dabc9c4f112825638..e331544be34a3e3168ad25fcea6df859fefe8aa6 100644 (file)
--- a/src/mpdclient.c
+++ b/src/mpdclient.c
-/*
- * $Id$
- *
- * (c) 2004 by Kalle Wallin <kaw@linux.se>
- *
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2009 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
+
+ * 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 "screen_utils.h"
+#include "filelist.h"
+#include "screen_client.h"
#include "config.h"
-#include "ncmpc.h"
-#include "support.h"
#include "options.h"
#include "strfsong.h"
+#include "utils.h"
+
+#include <mpd/client.h>
#include <stdlib.h>
#include <unistd.h>
#undef ENABLE_FANCY_PLAYLIST_MANAGMENT_CMD_ADD /* broken with song id's */
#define ENABLE_FANCY_PLAYLIST_MANAGMENT_CMD_DELETE
#define ENABLE_FANCY_PLAYLIST_MANAGMENT_CMD_MOVE
-#define ENABLE_SONG_ID
-#define ENABLE_PLCHANGES
#define BUFSIZE 1024
-#define MPD_ERROR(c) (c==NULL || c->connection==NULL || c->connection->error)
-
-/* from utils.c */
-extern GList *string_list_free(GList *string_list);
-
+static bool
+MPD_ERROR(const struct mpdclient *client)
+{
+ return client->connection == NULL ||
+ mpd_connection_get_error(client->connection) != MPD_ERROR_SUCCESS;
+}
/* filelist sorting functions */
static gint
-compare_filelistentry_dir(gconstpointer filelist_entry1,
+compare_filelistentry(gconstpointer filelist_entry1,
gconstpointer filelist_entry2)
{
- const mpd_InfoEntity *e1, *e2;
- char *key1, *key2;
+ const struct mpd_entity *e1, *e2;
int n = 0;
- e1 = ((const filelist_entry_t *)filelist_entry1)->entity;
- e2 = ((const filelist_entry_t *)filelist_entry2)->entity;
-
- if (e1 && e2 &&
- e1->type == MPD_INFO_ENTITY_TYPE_DIRECTORY &&
- e2->type == MPD_INFO_ENTITY_TYPE_DIRECTORY) {
- key1 = g_utf8_collate_key(e1->info.directory->path,-1);
- key2 = g_utf8_collate_key(e2->info.directory->path,-1);
- n = strcmp(key1,key2);
- g_free(key1);
- g_free(key2);
+ e1 = ((const struct filelist_entry *)filelist_entry1)->entity;
+ e2 = ((const struct filelist_entry *)filelist_entry2)->entity;
+
+ if (e1 != NULL && e2 != NULL &&
+ mpd_entity_get_type(e1) == mpd_entity_get_type(e2)) {
+ switch (mpd_entity_get_type(e1)) {
+ case MPD_ENTITY_TYPE_UNKNOWN:
+ break;
+ case MPD_ENTITY_TYPE_DIRECTORY:
+ n = g_utf8_collate(mpd_directory_get_path(mpd_entity_get_directory(e1)),
+ mpd_directory_get_path(mpd_entity_get_directory(e2)));
+ break;
+ case MPD_ENTITY_TYPE_SONG:
+ break;
+ case MPD_ENTITY_TYPE_PLAYLIST:
+ n = g_utf8_collate(mpd_playlist_get_path(mpd_entity_get_playlist(e1)),
+ mpd_playlist_get_path(mpd_entity_get_playlist(e2)));
+ }
}
-
return n;
}
compare_filelistentry_format(gconstpointer filelist_entry1,
gconstpointer filelist_entry2)
{
- const mpd_InfoEntity *e1, *e2;
+ const struct mpd_entity *e1, *e2;
char key1[BUFSIZE], key2[BUFSIZE];
int n = 0;
- e1 = ((const filelist_entry_t *)filelist_entry1)->entity;
- e2 = ((const filelist_entry_t *)filelist_entry2)->entity;
+ e1 = ((const struct filelist_entry *)filelist_entry1)->entity;
+ e2 = ((const struct filelist_entry *)filelist_entry2)->entity;
if (e1 && e2 &&
- e1->type == MPD_INFO_ENTITY_TYPE_SONG &&
- e2->type == MPD_INFO_ENTITY_TYPE_SONG) {
- strfsong(key1, BUFSIZE, LIST_FORMAT, e1->info.song);
- strfsong(key2, BUFSIZE, LIST_FORMAT, e2->info.song);
+ mpd_entity_get_type(e1) == MPD_ENTITY_TYPE_SONG &&
+ mpd_entity_get_type(e2) == MPD_ENTITY_TYPE_SONG) {
+ strfsong(key1, BUFSIZE, options.list_format, mpd_entity_get_song(e1));
+ strfsong(key2, BUFSIZE, options.list_format, mpd_entity_get_song(e2));
n = strcmp(key1,key2);
}
}
-/* Error callbacks */
-static gint
-error_cb(mpdclient_t *c, gint error, gchar *msg)
-{
- GList *list = c->error_callbacks;
-
- if( list==NULL )
- fprintf(stderr, "error [%d]: %s\n", (error & 0xFF), msg);
-
- while(list)
- {
- mpdc_error_cb_t cb = list->data;
- if( cb )
- cb(c, error, msg);
- list=list->next;
- }
- mpd_clearError(c->connection);
- return error;
-}
-
-#ifndef NDEBUG
-// Unused ath the moment
-/*
-#include "strfsong.h"
-
-static gchar *
-get_song_name(mpd_Song *song)
-{
- static gchar name[256];
-
- strfsong(name, 256, "[%artist% - ]%title%|%file%", song);
- return name;
-}
-*/
-#endif
-
/****************************************************************************/
/*** mpdclient functions ****************************************************/
/****************************************************************************/
gint
-mpdclient_finish_command(mpdclient_t *c)
-{
- mpd_finishCommand(c->connection);
-
- if( c->connection->error )
- {
- gchar *msg = locale_to_utf8(c->connection->errorStr);
- gint error = c->connection->error;
- if( error == MPD_ERROR_ACK )
- error = error | (c->connection->errorCode << 8);
- if( c->connection->errorCode == MPD_ACK_ERROR_PERMISSION )
- {
- if(screen_auth(c) == 0) return 0;
+mpdclient_handle_error(struct mpdclient *c)
+{
+ enum mpd_error error = mpd_connection_get_error(c->connection);
+
+ assert(error != MPD_ERROR_SUCCESS);
+
+ if (error == MPD_ERROR_SERVER &&
+ mpd_connection_get_server_error(c->connection) == MPD_SERVER_ERROR_PERMISSION &&
+ screen_auth(c))
+ return 0;
+
+ if (error == MPD_ERROR_SERVER)
+ error = error | (mpd_connection_get_server_error(c->connection) << 8);
+
+ for (GList *list = c->error_callbacks; list != NULL;
+ list = list->next) {
+ mpdc_error_cb_t cb = list->data;
+ cb(c, error, mpd_connection_get_error_message(c->connection));
}
- error_cb(c, error, msg);
- g_free(msg);
- return error;
- }
- return 0;
+ if (!mpd_connection_clear_error(c->connection))
+ mpdclient_disconnect(c);
+
+ return error;
}
-mpdclient_t *
+static gint
+mpdclient_finish_command(struct mpdclient *c)
+{
+ return mpd_response_finish(c->connection)
+ ? 0 : mpdclient_handle_error(c);
+}
+
+struct mpdclient *
mpdclient_new(void)
{
- mpdclient_t *c;
+ struct mpdclient *c;
- c = g_malloc0(sizeof(mpdclient_t));
+ c = g_new0(struct mpdclient, 1);
playlist_init(&c->playlist);
+ c->volume = -1;
return c;
}
void
-mpdclient_free(mpdclient_t *c)
+mpdclient_free(struct mpdclient *c)
{
mpdclient_disconnect(c);
g_free(c);
}
-gint
-mpdclient_disconnect(mpdclient_t *c)
+void
+mpdclient_disconnect(struct mpdclient *c)
{
if (c->connection)
- mpd_closeConnection(c->connection);
+ mpd_connection_free(c->connection);
c->connection = NULL;
if (c->status)
- mpd_freeStatus(c->status);
+ mpd_status_free(c->status);
c->status = NULL;
playlist_clear(&c->playlist);
if (c->song)
c->song = NULL;
-
- return 0;
}
-gint
-mpdclient_connect(mpdclient_t *c,
- gchar *host,
+bool
+mpdclient_connect(struct mpdclient *c,
+ const gchar *host,
gint port,
gfloat _timeout,
- gchar *password)
+ const gchar *password)
{
- gint retval = 0;
-
/* close any open connection */
if( c->connection )
mpdclient_disconnect(c);
/* connect to MPD */
- c->connection = mpd_newConnection(host, port, _timeout);
- if( c->connection->error )
- return error_cb(c, c->connection->error,
- c->connection->errorStr);
+ c->connection = mpd_connection_new(host, port, _timeout * 1000);
+ if (c->connection == NULL)
+ g_error("Out of memory");
+
+ if (mpd_connection_get_error(c->connection) != MPD_ERROR_SUCCESS) {
+ mpdclient_handle_error(c);
+ mpdclient_disconnect(c);
+ return false;
+ }
/* send password */
- if( password ) {
- mpd_sendPasswordCommand(c->connection, password);
- retval = mpdclient_finish_command(c);
+ if (password != NULL && !mpd_run_password(c->connection, password)) {
+ mpdclient_handle_error(c);
+ mpdclient_disconnect(c);
+ return false;
}
- c->need_update = TRUE;
- return retval;
+ return true;
}
-gint
-mpdclient_update(mpdclient_t *c)
+bool
+mpdclient_update(struct mpdclient *c)
{
- gint retval = 0;
+ bool retval;
+
+ c->volume = -1;
if (MPD_ERROR(c))
- return -1;
+ return false;
/* free the old status */
if (c->status)
- mpd_freeStatus(c->status);
+ mpd_status_free(c->status);
- /* retreive new status */
- mpd_sendStatusCommand(c->connection);
- c->status = mpd_getStatus(c->connection);
- if ((retval=mpdclient_finish_command(c)))
- return retval;
-#ifndef NDEBUG
- if (c->status->error)
- D("status> %s\n", c->status->error);
-#endif
+ /* retrieve new status */
+ c->status = mpd_run_status(c->connection);
+ if (c->status == NULL)
+ return mpdclient_handle_error(c) == 0;
+
+ if (c->update_id > 0 &&
+ c->update_id != mpd_status_get_update_id(c->status))
+ mpdclient_browse_callback(c, BROWSE_DB_UPDATED, NULL);
+
+ c->update_id = mpd_status_get_update_id(c->status);
+ c->volume = mpd_status_get_volume(c->status);
/* check if the playlist needs an update */
- if (c->playlist.id != c->status->playlist) {
- if (playlist_is_empty(&c->playlist))
+ if (c->playlist.id != mpd_status_get_queue_version(c->status)) {
+ if (!playlist_is_empty(&c->playlist))
retval = mpdclient_playlist_update_changes(c);
else
retval = mpdclient_playlist_update(c);
- }
+ } else
+ retval = true;
/* update the current song */
- if (!c->song || c->status->songid != c->song->id) {
- c->song = playlist_get_song(c, c->status->song);
+ if (!c->song || mpd_status_get_song_id(c->status)) {
+ c->song = playlist_get_song(&c->playlist,
+ mpd_status_get_song_pos(c->status));
}
- c->need_update = FALSE;
-
return retval;
}
/****************************************************************************/
gint
-mpdclient_cmd_play(mpdclient_t *c, gint idx)
+mpdclient_cmd_play(struct mpdclient *c, gint idx)
{
-#ifdef ENABLE_SONG_ID
- struct mpd_song *song = playlist_get_song(c, idx);
+ const struct mpd_song *song = playlist_get_song(&c->playlist, idx);
+
+ if (MPD_ERROR(c))
+ return -1;
- D("Play id:%d\n", song ? song->id : -1);
if (song)
- mpd_sendPlayIdCommand(c->connection, song->id);
+ mpd_send_play_id(c->connection, mpd_song_get_id(song));
else
- mpd_sendPlayIdCommand(c->connection, MPD_PLAY_AT_BEGINNING);
-#else
- mpd_sendPlayCommand(c->connection, idx);
-#endif
- c->need_update = TRUE;
+ mpd_send_play(c->connection);
+
return mpdclient_finish_command(c);
}
gint
-mpdclient_cmd_pause(mpdclient_t *c, gint value)
+mpdclient_cmd_crop(struct mpdclient *c)
{
- mpd_sendPauseCommand(c->connection, value);
+ struct mpd_status *status;
+ bool playing;
+ int length, current;
+
+ if (MPD_ERROR(c))
+ return -1;
+
+ 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)
+ return 0;
+
+ mpd_command_list_begin(c->connection, false);
+
+ while (--length >= 0)
+ if (length != current)
+ mpd_send_delete(c->connection, length);
+
+ mpd_command_list_end(c->connection);
+
return mpdclient_finish_command(c);
}
gint
-mpdclient_cmd_stop(mpdclient_t *c)
+mpdclient_cmd_shuffle_range(struct mpdclient *c, guint start, guint end)
{
- mpd_sendStopCommand(c->connection);
+ mpd_send_shuffle_range(c->connection, start, end);
return mpdclient_finish_command(c);
}
gint
-mpdclient_cmd_next(mpdclient_t *c)
+mpdclient_cmd_clear(struct mpdclient *c)
{
- mpd_sendNextCommand(c->connection);
- c->need_update = TRUE;
- return mpdclient_finish_command(c);
+ gint retval = 0;
+
+ if (MPD_ERROR(c))
+ return -1;
+
+ mpd_send_clear(c->connection);
+ retval = mpdclient_finish_command(c);
+ /* call playlist updated callback */
+ mpdclient_playlist_callback(c, PLAYLIST_EVENT_CLEAR, NULL);
+ return retval;
}
gint
-mpdclient_cmd_prev(mpdclient_t *c)
+mpdclient_cmd_volume(struct mpdclient *c, gint value)
{
- mpd_sendPrevCommand(c->connection);
- c->need_update = TRUE;
+ if (MPD_ERROR(c))
+ return -1;
+
+ mpd_send_set_volume(c->connection, value);
return mpdclient_finish_command(c);
}
-gint
-mpdclient_cmd_seek(mpdclient_t *c, gint id, gint pos)
+gint mpdclient_cmd_volume_up(struct mpdclient *c)
{
- D("Seek id:%d\n", id);
- mpd_sendSeekIdCommand(c->connection, id, pos);
- return mpdclient_finish_command(c);
-}
+ if (MPD_ERROR(c))
+ return -1;
-gint
-mpdclient_cmd_shuffle(mpdclient_t *c)
-{
- mpd_sendShuffleCommand(c->connection);
- c->need_update = TRUE;
- return mpdclient_finish_command(c);
-}
+ if (c->status == NULL ||
+ mpd_status_get_volume(c->status) == -1)
+ return 0;
-gint
-mpdclient_cmd_clear(mpdclient_t *c)
-{
- gint retval = 0;
+ if (c->volume < 0)
+ c->volume = mpd_status_get_volume(c->status);
- mpd_sendClearCommand(c->connection);
- retval = mpdclient_finish_command(c);
- /* call playlist updated callback */
- mpdclient_playlist_callback(c, PLAYLIST_EVENT_CLEAR, NULL);
- c->need_update = TRUE;
- return retval;
-}
+ if (c->volume >= 100)
+ return 0;
-gint
-mpdclient_cmd_repeat(mpdclient_t *c, gint value)
-{
- mpd_sendRepeatCommand(c->connection, value);
- return mpdclient_finish_command(c);
+ return mpdclient_cmd_volume(c, ++c->volume);
}
-gint
-mpdclient_cmd_random(mpdclient_t *c, gint value)
+gint mpdclient_cmd_volume_down(struct mpdclient *c)
{
- mpd_sendRandomCommand(c->connection, value);
- return mpdclient_finish_command(c);
-}
+ if (MPD_ERROR(c))
+ return -1;
-gint
-mpdclient_cmd_crossfade(mpdclient_t *c, gint value)
-{
- mpd_sendCrossfadeCommand(c->connection, value);
- return mpdclient_finish_command(c);
-}
+ if (c->status == NULL || mpd_status_get_volume(c->status) < 0)
+ return 0;
-gint
-mpdclient_cmd_db_update_utf8(mpdclient_t *c, gchar *path)
-{
- mpd_sendUpdateCommand(c->connection, path ? path : "");
- return mpdclient_finish_command(c);
-}
+ if (c->volume < 0)
+ c->volume = mpd_status_get_volume(c->status);
-gint
-mpdclient_cmd_volume(mpdclient_t *c, gint value)
-{
- mpd_sendSetvolCommand(c->connection, value);
- return mpdclient_finish_command(c);
-}
+ if (c->volume <= 0)
+ return 0;
-gint
-mpdclient_cmd_add_path_utf8(mpdclient_t *c, gchar *path_utf8)
-{
- mpd_sendAddCommand(c->connection, path_utf8);
- return mpdclient_finish_command(c);
+ return mpdclient_cmd_volume(c, --c->volume);
}
-gint
-mpdclient_cmd_add_path(mpdclient_t *c, gchar *path)
+gint
+mpdclient_cmd_add_path(struct mpdclient *c, const gchar *path_utf8)
{
- gint retval;
- gchar *path_utf8 = locale_to_utf8(path);
+ if (MPD_ERROR(c))
+ return -1;
- retval=mpdclient_cmd_add_path_utf8(c, path_utf8);
- g_free(path_utf8);
- return retval;
+ mpd_send_add(c->connection, path_utf8);
+ return mpdclient_finish_command(c);
}
gint
-mpdclient_cmd_add(mpdclient_t *c, struct mpd_song *song)
+mpdclient_cmd_add(struct mpdclient *c, const struct mpd_song *song)
{
gint retval = 0;
- if( !song || !song->file )
+ if (MPD_ERROR(c))
+ return -1;
+
+ if (song == NULL)
return -1;
/* send the add command to mpd */
- mpd_sendAddCommand(c->connection, song->file);
+ mpd_send_add(c->connection, mpd_song_get_uri(song));
if( (retval=mpdclient_finish_command(c)) )
return retval;
/* add the song to playlist */
playlist_append(&c->playlist, song);
- /* increment the playlist id, so we dont retrives a new playlist */
+ /* increment the playlist id, so we don't retrieve a new playlist */
c->playlist.id++;
/* call playlist updated callback */
mpdclient_playlist_callback(c, PLAYLIST_EVENT_ADD, (gpointer) song);
-#else
- c->need_update = TRUE;
#endif
return 0;
}
gint
-mpdclient_cmd_delete(mpdclient_t *c, gint idx)
+mpdclient_cmd_delete(struct mpdclient *c, gint idx)
{
gint retval = 0;
struct mpd_song *song;
+ if (MPD_ERROR(c))
+ return -1;
+
if (idx < 0 || (guint)idx >= playlist_length(&c->playlist))
return -1;
song = playlist_get(&c->playlist, idx);
/* send the delete command to mpd */
-#ifdef ENABLE_SONG_ID
- D("Delete id:%d\n", song->id);
- mpd_sendDeleteIdCommand(c->connection, song->id);
-#else
- mpd_sendDeleteCommand(c->connection, idx);
-#endif
+ mpd_send_delete_id(c->connection, mpd_song_get_id(song));
if( (retval=mpdclient_finish_command(c)) )
return retval;
#ifdef ENABLE_FANCY_PLAYLIST_MANAGMENT_CMD_DELETE
- /* increment the playlist id, so we dont retrive a new playlist */
+ /* increment the playlist id, so we don't retrieve a new playlist */
c->playlist.id++;
/* remove the song from the playlist */
mpdclient_playlist_callback(c, PLAYLIST_EVENT_DELETE, (gpointer) song);
/* remove references to the song */
- if (c->song == song) {
+ if (c->song == song)
c->song = NULL;
- c->need_update = TRUE;
- }
- mpd_freeSong(song);
-
-#else
- c->need_update = TRUE;
+ mpd_song_free(song);
#endif
return 0;
}
gint
-mpdclient_cmd_move(mpdclient_t *c, gint old_index, gint new_index)
+mpdclient_cmd_move(struct mpdclient *c, gint old_index, gint new_index)
{
gint n;
struct mpd_song *song1, *song2;
+ if (MPD_ERROR(c))
+ return -1;
+
if (old_index == new_index || new_index < 0 ||
(guint)new_index >= c->playlist.list->len)
return -1;
song2 = playlist_get(&c->playlist, new_index);
/* send the move command to mpd */
-#ifdef ENABLE_SONG_ID
- D("Swapping id:%d with id:%d\n", song1->id, song2->id);
- mpd_sendSwapIdCommand(c->connection, song1->id, song2->id);
-#else
- D("Moving index %d to id:%d\n", old_index, new_index);
- mpd_sendMoveCommand(c->connection, old_index, new_index);
-#endif
+ mpd_send_swap_id(c->connection,
+ mpd_song_get_id(song1), mpd_song_get_id(song2));
if( (n=mpdclient_finish_command(c)) )
return n;
/* update the playlist */
playlist_swap(&c->playlist, old_index, new_index);
- /* increment the playlist id, so we dont retrives a new playlist */
+ /* increment the playlist id, so we don't retrieve a new playlist */
c->playlist.id++;
-
-#else
- c->need_update = TRUE;
#endif
/* call playlist updated callback */
- D("move> new_index=%d, old_index=%d\n", new_index, old_index);
mpdclient_playlist_callback(c, PLAYLIST_EVENT_MOVE, (gpointer) &new_index);
return 0;
}
-gint
-mpdclient_cmd_save_playlist_utf8(mpdclient_t *c, gchar *filename_utf8)
+gint
+mpdclient_cmd_save_playlist(struct mpdclient *c, const gchar *filename_utf8)
{
- gint retval = 0;
-
- mpd_sendSaveCommand(c->connection, filename_utf8);
- if( (retval=mpdclient_finish_command(c)) == 0 )
- mpdclient_browse_callback(c, BROWSE_PLAYLIST_SAVED, NULL);
- return retval;
-}
+ gint retval = 0;
-gint
-mpdclient_cmd_save_playlist(mpdclient_t *c, gchar *filename)
-{
- gint retval = 0;
- gchar *filename_utf8 = locale_to_utf8(filename);
-
- retval = mpdclient_cmd_save_playlist_utf8(c, filename);
- g_free(filename_utf8);
- return retval;
-}
+ if (MPD_ERROR(c))
+ return -1;
-gint
-mpdclient_cmd_load_playlist_utf8(mpdclient_t *c, gchar *filename_utf8)
-{
- mpd_sendLoadCommand(c->connection, filename_utf8);
- c->need_update = TRUE;
- return mpdclient_finish_command(c);
+ mpd_send_save(c->connection, filename_utf8);
+ if ((retval = mpdclient_finish_command(c)) == 0)
+ mpdclient_browse_callback(c, BROWSE_PLAYLIST_SAVED, NULL);
+ return retval;
}
-gint
-mpdclient_cmd_delete_playlist_utf8(mpdclient_t *c, gchar *filename_utf8)
+gint
+mpdclient_cmd_load_playlist(struct mpdclient *c, const gchar *filename_utf8)
{
- gint retval = 0;
+ if (MPD_ERROR(c))
+ return -1;
- mpd_sendRmCommand(c->connection, filename_utf8);
- if( (retval=mpdclient_finish_command(c)) == 0 )
- mpdclient_browse_callback(c, BROWSE_PLAYLIST_DELETED, NULL);
- return retval;
+ mpd_send_load(c->connection, filename_utf8);
+ return mpdclient_finish_command(c);
}
-gint
-mpdclient_cmd_delete_playlist(mpdclient_t *c, gchar *filename)
+gint
+mpdclient_cmd_delete_playlist(struct mpdclient *c, const gchar *filename_utf8)
{
- gint retval = 0;
- gchar *filename_utf8 = locale_to_utf8(filename);
+ gint retval = 0;
- retval = mpdclient_cmd_delete_playlist_utf8(c, filename_utf8);
- g_free(filename_utf8);
- return retval;
+ if (MPD_ERROR(c))
+ return -1;
+
+ mpd_send_rm(c->connection, filename_utf8);
+ if ((retval = mpdclient_finish_command(c)) == 0)
+ mpdclient_browse_callback(c, BROWSE_PLAYLIST_DELETED, NULL);
+ return retval;
}
/****************************************************************************/
-/*** Callback managment functions *******************************************/
+/*** Callback management functions ******************************************/
/****************************************************************************/
+
static void
-do_list_callbacks(mpdclient_t *c, GList *list, gint event, gpointer data)
+do_list_callbacks(struct mpdclient *c, GList *list, gint event, gpointer data)
{
- while(list)
- {
- mpdc_list_cb_t fn = list->data;
+ while (list) {
+ mpdc_list_cb_t fn = list->data;
- fn(c, event, data);
- list=list->next;
- }
+ fn(c, event, data);
+ list = list->next;
+ }
}
void
-mpdclient_playlist_callback(mpdclient_t *c, int event, gpointer data)
+mpdclient_playlist_callback(struct mpdclient *c, int event, gpointer data)
{
- do_list_callbacks(c, c->playlist_callbacks, event, data);
+ do_list_callbacks(c, c->playlist_callbacks, event, data);
}
void
-mpdclient_install_playlist_callback(mpdclient_t *c,mpdc_list_cb_t cb)
+mpdclient_install_playlist_callback(struct mpdclient *c,mpdc_list_cb_t cb)
{
- c->playlist_callbacks = g_list_append(c->playlist_callbacks, cb);
+ c->playlist_callbacks = g_list_append(c->playlist_callbacks, cb);
}
void
-mpdclient_remove_playlist_callback(mpdclient_t *c, mpdc_list_cb_t cb)
+mpdclient_remove_playlist_callback(struct mpdclient *c, mpdc_list_cb_t cb)
{
- c->playlist_callbacks = g_list_remove(c->playlist_callbacks, cb);
+ c->playlist_callbacks = g_list_remove(c->playlist_callbacks, cb);
}
void
-mpdclient_browse_callback(mpdclient_t *c, int event, gpointer data)
+mpdclient_browse_callback(struct mpdclient *c, int event, gpointer data)
{
- do_list_callbacks(c, c->browse_callbacks, event, data);
+ do_list_callbacks(c, c->browse_callbacks, event, data);
}
void
-mpdclient_install_browse_callback(mpdclient_t *c,mpdc_list_cb_t cb)
+mpdclient_install_browse_callback(struct mpdclient *c,mpdc_list_cb_t cb)
{
- c->browse_callbacks = g_list_append(c->browse_callbacks, cb);
+ c->browse_callbacks = g_list_append(c->browse_callbacks, cb);
}
void
-mpdclient_remove_browse_callback(mpdclient_t *c, mpdc_list_cb_t cb)
+mpdclient_remove_browse_callback(struct mpdclient *c, mpdc_list_cb_t cb)
{
- c->browse_callbacks = g_list_remove(c->browse_callbacks, cb);
+ c->browse_callbacks = g_list_remove(c->browse_callbacks, cb);
}
void
-mpdclient_install_error_callback(mpdclient_t *c, mpdc_error_cb_t cb)
+mpdclient_install_error_callback(struct mpdclient *c, mpdc_error_cb_t cb)
{
- c->error_callbacks = g_list_append(c->error_callbacks, cb);
+ c->error_callbacks = g_list_append(c->error_callbacks, cb);
}
void
-mpdclient_remove_error_callback(mpdclient_t *c, mpdc_error_cb_t cb)
+mpdclient_remove_error_callback(struct mpdclient *c, mpdc_error_cb_t cb)
{
- c->error_callbacks = g_list_remove(c->error_callbacks, cb);
+ c->error_callbacks = g_list_remove(c->error_callbacks, cb);
}
+
/****************************************************************************/
-/*** Playlist managment functions *******************************************/
+/*** Playlist management functions ******************************************/
/****************************************************************************/
-
/* update playlist */
-gint
-mpdclient_playlist_update(mpdclient_t *c)
+bool
+mpdclient_playlist_update(struct mpdclient *c)
{
- mpd_InfoEntity *entity;
-
- D("mpdclient_playlist_update() [%lld]\n", c->status->playlist);
+ struct mpd_entity *entity;
if (MPD_ERROR(c))
- return -1;
+ return false;
playlist_clear(&c->playlist);
- mpd_sendPlaylistInfoCommand(c->connection,-1);
- while ((entity = mpd_getNextInfoEntity(c->connection))) {
- if (entity->type == MPD_INFO_ENTITY_TYPE_SONG)
- playlist_append(&c->playlist, entity->info.song);
+ mpd_send_list_queue_meta(c->connection);
+ while ((entity = mpd_recv_entity(c->connection))) {
+ if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_SONG)
+ playlist_append(&c->playlist, mpd_entity_get_song(entity));
- mpd_freeInfoEntity(entity);
+ mpd_entity_free(entity);
}
- c->playlist.id = c->status->playlist;
+ c->playlist.id = mpd_status_get_queue_version(c->status);
c->song = NULL;
/* call playlist updated callbacks */
mpdclient_playlist_callback(c, PLAYLIST_EVENT_UPDATED, NULL);
- return mpdclient_finish_command(c);
+ return mpdclient_finish_command(c) == 0;
}
-#ifdef ENABLE_PLCHANGES
-
/* update playlist (plchanges) */
-gint
-mpdclient_playlist_update_changes(mpdclient_t *c)
+bool
+mpdclient_playlist_update_changes(struct mpdclient *c)
{
- mpd_InfoEntity *entity;
-
- D("mpdclient_playlist_update_changes() [%lld -> %lld]\n",
- c->status->playlist, c->playlist.id);
+ struct mpd_song *song;
+ guint length;
if (MPD_ERROR(c))
- return -1;
+ return false;
- mpd_sendPlChangesCommand(c->connection, c->playlist.id);
+ mpd_send_queue_changes_meta(c->connection, c->playlist.id);
- while ((entity = mpd_getNextInfoEntity(c->connection)) != NULL) {
- struct mpd_song *song = entity->info.song;
+ while ((song = mpd_recv_song(c->connection)) != NULL) {
+ int pos = mpd_song_get_pos(song);
- if (song->pos >= 0 && (guint)song->pos < c->playlist.list->len) {
+ if (pos >= 0 && (guint)pos < c->playlist.list->len) {
/* update song */
- D("updating pos:%d, id=%d - %s\n",
- song->pos, song->id, song->file);
- playlist_replace(&c->playlist, song->pos, song);
+ playlist_replace(&c->playlist, pos, song);
} else {
/* add a new song */
- D("adding song at pos %d\n", song->pos);
playlist_append(&c->playlist, song);
}
- mpd_freeInfoEntity(entity);
+ mpd_song_free(song);
}
/* remove trailing songs */
- while ((guint)c->status->playlistLength < c->playlist.list->len) {
+
+ length = mpd_status_get_queue_length(c->status);
+ while (length < c->playlist.list->len) {
guint pos = c->playlist.list->len - 1;
/* Remove the last playlist entry */
- D("removing song at pos %d\n", pos);
playlist_remove(&c->playlist, pos);
}
c->song = NULL;
- c->playlist.id = c->status->playlist;
+ c->playlist.id = mpd_status_get_queue_version(c->status);
mpdclient_playlist_callback(c, PLAYLIST_EVENT_UPDATED, NULL);
- return 0;
+ return mpdclient_finish_command(c) == 0;
}
-#else
-gint
-mpdclient_playlist_update_changes(mpdclient_t *c)
-{
- return mpdclient_playlist_update(c);
-}
-#endif
-
/****************************************************************************/
/*** Filelist functions *****************************************************/
/****************************************************************************/
-mpdclient_filelist_t *
-mpdclient_filelist_get(mpdclient_t *c, const gchar *path)
+struct filelist *
+mpdclient_filelist_get(struct mpdclient *c, const gchar *path)
{
- mpdclient_filelist_t *filelist;
- mpd_InfoEntity *entity;
- gchar *path_utf8 = locale_to_utf8(path);
- gboolean has_dirs_only = TRUE;
+ struct filelist *filelist;
+ struct mpd_entity *entity;
+
+ if (MPD_ERROR(c))
+ return NULL;
- D("mpdclient_filelist_get(%s)\n", path);
- mpd_sendLsInfoCommand(c->connection, path_utf8);
- filelist = filelist_new(path);
+ mpd_send_list_meta(c->connection, path);
+ filelist = filelist_new();
if (path && path[0] && strcmp(path, "/"))
/* add a dummy entry for ./.. */
filelist_append(filelist, NULL);
- while ((entity=mpd_getNextInfoEntity(c->connection))) {
+ while ((entity = mpd_recv_entity(c->connection)) != NULL)
filelist_append(filelist, entity);
- if (has_dirs_only && entity->type != MPD_INFO_ENTITY_TYPE_DIRECTORY) {
- has_dirs_only = FALSE;
- }
- }
-
/* If there's an error, ignore it. We'll return an empty filelist. */
mpdclient_finish_command(c);
- g_free(path_utf8);
- filelist->updated = TRUE;
-
- // If there are only directory entities in the filelist, we sort it
- if (has_dirs_only) {
- D("mpdclient_filelist_get: only dirs; sorting!\n");
- filelist_sort(filelist, compare_filelistentry_dir);
- }
+ filelist_sort_dir_play(filelist, compare_filelistentry);
return filelist;
}
-mpdclient_filelist_t *
-mpdclient_filelist_search_utf8(mpdclient_t *c,
- int exact_match,
- int table,
- gchar *filter_utf8)
+static struct filelist *
+mpdclient_recv_filelist_response(struct mpdclient *c)
{
- mpdclient_filelist_t *filelist;
- mpd_InfoEntity *entity;
+ struct filelist *filelist;
+ struct mpd_entity *entity;
- D("mpdclient_filelist_search(%s)\n", filter_utf8);
- if (exact_match)
- mpd_sendFindCommand(c->connection, table, filter_utf8);
- else
- mpd_sendSearchCommand(c->connection, table, filter_utf8);
- filelist = filelist_new(NULL);
+ filelist = filelist_new();
- while ((entity=mpd_getNextInfoEntity(c->connection)))
+ while ((entity = mpd_recv_entity(c->connection)) != NULL)
filelist_append(filelist, entity);
if (mpdclient_finish_command(c)) {
return NULL;
}
- filelist->updated = TRUE;
return filelist;
}
-
-mpdclient_filelist_t *
-mpdclient_filelist_search(mpdclient_t *c,
+struct filelist *
+mpdclient_filelist_search(struct mpdclient *c,
int exact_match,
- int table,
- gchar *_filter)
+ enum mpd_tag_type tag,
+ gchar *filter_utf8)
{
- mpdclient_filelist_t *filelist;
- gchar *filter_utf8 = locale_to_utf8(_filter);
-
- D("mpdclient_filelist_search(%s)\n", _filter);
- filelist = mpdclient_filelist_search_utf8(c, exact_match, table,
- filter_utf8);
- g_free(filter_utf8);
-
- return filelist;
-}
+ if (MPD_ERROR(c))
+ return NULL;
-mpdclient_filelist_t *
-mpdclient_filelist_update(mpdclient_t *c, mpdclient_filelist_t *filelist)
-{
- if( filelist != NULL )
- {
- gchar *path = g_strdup(filelist->path);
+ mpd_search_db_songs(c->connection, exact_match);
+ mpd_search_add_tag_constraint(c->connection, MPD_OPERATOR_DEFAULT,
+ tag, filter_utf8);
+ mpd_search_commit(c->connection);
- filelist_free(filelist);
- filelist = mpdclient_filelist_get(c, path);
- g_free(path);
- return filelist;
- }
- return NULL;
+ return mpdclient_recv_filelist_response(c);
}
int
-mpdclient_filelist_add_all(mpdclient_t *c, mpdclient_filelist_t *fl)
+mpdclient_filelist_add_all(struct mpdclient *c, struct filelist *fl)
{
- GList *list = g_list_first(fl->list);
+ guint i;
+
+ if (MPD_ERROR(c))
+ return -1;
if (filelist_is_empty(fl))
return 0;
- mpd_sendCommandListBegin(c->connection);
- while (list) {
- filelist_entry_t *entry = list->data;
- mpd_InfoEntity *entity = entry->entity;
+ mpd_command_list_begin(c->connection, false);
- if (entity && entity->type == MPD_INFO_ENTITY_TYPE_SONG) {
- struct mpd_song *song = entity->info.song;
+ for (i = 0; i < filelist_length(fl); ++i) {
+ struct filelist_entry *entry = filelist_get(fl, i);
+ struct mpd_entity *entity = entry->entity;
- mpd_sendAddCommand(c->connection, song->file);
- }
+ if (entity != NULL &&
+ mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_SONG) {
+ const struct mpd_song *song =
+ mpd_entity_get_song(entity);
+ const char *uri = mpd_song_get_uri(song);
- list = list->next;
+ if (uri != NULL)
+ mpd_send_add(c->connection, uri);
+ }
}
- mpd_sendCommandListEnd(c->connection);
+ mpd_command_list_end(c->connection);
return mpdclient_finish_command(c);
}
GList *
-mpdclient_get_artists_utf8(mpdclient_t *c)
+mpdclient_get_artists(struct mpdclient *c)
{
- gchar *str = NULL;
- GList *list = NULL;
+ GList *list = NULL;
+ struct mpd_pair *pair;
- D("mpdclient_get_artists()\n");
- mpd_sendListCommand(c->connection, MPD_TABLE_ARTIST, NULL);
- while( (str=mpd_getNextArtist(c->connection)) )
- {
- list = g_list_append(list, (gpointer) str);
- }
- if( mpdclient_finish_command(c) )
- {
- return string_list_free(list);
- }
+ if (MPD_ERROR(c))
+ return NULL;
- return list;
-}
+ mpd_search_db_tags(c->connection, MPD_TAG_ARTIST);
+ mpd_search_commit(c->connection);
-GList *
-mpdclient_get_albums_utf8(mpdclient_t *c, gchar *artist_utf8)
-{
- gchar *str = NULL;
- GList *list = NULL;
+ 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);
+ }
- D("mpdclient_get_albums(%s)\n", artist_utf8);
- mpd_sendListCommand(c->connection, MPD_TABLE_ALBUM, artist_utf8);
- while( (str=mpd_getNextAlbum(c->connection)) )
- {
- list = g_list_append(list, (gpointer) str);
- }
- if( mpdclient_finish_command(c) )
- {
- return string_list_free(list);
- }
-
- return list;
-}
+ 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;
+}