![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/mpdclient.c b/src/mpdclient.c
index 941c0911444cbf10c007c161dd3cc463bf790b52..6d9d72b9c206789e6694400783397f8b13553ba1 100644 (file)
--- a/src/mpdclient.c
+++ b/src/mpdclient.c
*
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <time.h>
-#include <string.h>
-#include <glib.h>
-
+#include "mpdclient.h"
+#include "screen_utils.h"
#include "config.h"
#include "ncmpc.h"
#include "support.h"
-#include "mpdclient.h"
#include "options.h"
#include "strfsong.h"
+#include <stdlib.h>
+#include <unistd.h>
+#include <time.h>
+#include <string.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
mpdclient_t *
mpdclient_new(void)
{
- mpdclient_t *c;
+ mpdclient_t *c;
- c = g_malloc0(sizeof(mpdclient_t));
+ c = g_malloc0(sizeof(mpdclient_t));
+ playlist_init(&c->playlist);
- return c;
+ return c;
}
-mpdclient_t *
+void
mpdclient_free(mpdclient_t *c)
{
- mpdclient_disconnect(c);
- g_list_free(c->error_callbacks);
- g_list_free(c->playlist_callbacks);
- g_list_free(c->browse_callbacks);
- g_free(c);
+ mpdclient_disconnect(c);
- return NULL;
+ mpdclient_playlist_free(&c->playlist);
+
+ g_list_free(c->error_callbacks);
+ g_list_free(c->playlist_callbacks);
+ g_list_free(c->browse_callbacks);
+ g_free(c);
}
gint
mpdclient_disconnect(mpdclient_t *c)
{
- if( c->connection )
- mpd_closeConnection(c->connection);
- c->connection = NULL;
+ if (c->connection)
+ mpd_closeConnection(c->connection);
+ c->connection = NULL;
- if( c->status )
- mpd_freeStatus(c->status);
- c->status = NULL;
+ if (c->status)
+ mpd_freeStatus(c->status);
+ c->status = NULL;
- if( c->playlist.list )
- mpdclient_playlist_free(&c->playlist);
+ playlist_clear(&c->playlist);
- if( c->song )
- c->song = NULL;
-
- return 0;
+ if (c->song)
+ c->song = NULL;
+
+ return 0;
}
gint
mpdclient_connect(mpdclient_t *c,
gchar *host,
gint port,
- gfloat timeout,
+ gfloat _timeout,
gchar *password)
{
gint retval = 0;
mpdclient_disconnect(c);
/* connect to MPD */
- c->connection = mpd_newConnection(host, port, timeout);
+ c->connection = mpd_newConnection(host, port, _timeout);
if( c->connection->error )
return error_cb(c, c->connection->error,
c->connection->errorStr);
gint
mpdclient_update(mpdclient_t *c)
{
- gint retval = 0;
+ gint retval = 0;
+
+ if (MPD_ERROR(c))
+ return -1;
- if( MPD_ERROR(c) )
- return -1;
+ /* free the old status */
+ if (c->status)
+ mpd_freeStatus(c->status);
- /* free the old status */
- if( c->status )
- mpd_freeStatus(c->status);
-
- /* retreive new status */
- mpd_sendStatusCommand(c->connection);
- c->status = mpd_getStatus(c->connection);
- if( (retval=mpdclient_finish_command(c)) )
- return retval;
+ /* 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);
+ if (c->status->error)
+ D("status> %s\n", c->status->error);
#endif
- /* check if the playlist needs an update */
- if( c->playlist.id != c->status->playlist )
- {
- if( c->playlist.list )
- retval = mpdclient_playlist_update_changes(c);
- else
- retval = mpdclient_playlist_update(c);
- }
+ /* check if the playlist needs an update */
+ if (c->playlist.id != c->status->playlist) {
+ if (playlist_is_empty(&c->playlist))
+ retval = mpdclient_playlist_update_changes(c);
+ else
+ retval = mpdclient_playlist_update(c);
+ }
- /* update the current song */
- if( !c->song || c->status->songid != c->song->id )
- {
- c->song = playlist_get_song(c, c->status->song);
- }
+ /* update the current song */
+ if (!c->song || c->status->songid != c->song->id) {
+ c->song = playlist_get_song(c, c->status->song);
+ }
- c->need_update = FALSE;
+ c->need_update = FALSE;
- return retval;
+ return retval;
}
/****************************************************************************/
gint
-mpdclient_cmd_play(mpdclient_t *c, gint index)
+mpdclient_cmd_play(mpdclient_t *c, gint idx)
{
#ifdef ENABLE_SONG_ID
- mpd_Song *song = playlist_get_song(c, index);
+ struct mpd_song *song = playlist_get_song(c, idx);
D("Play id:%d\n", song ? song->id : -1);
if (song)
else
mpd_sendPlayIdCommand(c->connection, MPD_PLAY_AT_BEGINNING);
#else
- mpd_sendPlayCommand(c->connection, index);
+ mpd_sendPlayCommand(c->connection, idx);
#endif
c->need_update = TRUE;
return mpdclient_finish_command(c);
return mpdclient_finish_command(c);
}
+gint
+mpdclient_cmd_crop(mpdclient_t *c)
+{
+ mpd_Status *status;
+ int length;
+
+ mpd_sendStatusCommand(c->connection);
+ status = mpd_getStatus(c->connection);
+ length = status->playlistLength - 1;
+
+ if (length <= 0) {
+ mpd_freeStatus(status);
+ screen_status_message("You have to have a playlist longer than 1 song in length to crop");
+ } else if (status->state == 3 || status->state == 2) {
+ /* If playing or paused */
+
+ mpd_sendCommandListBegin( c->connection );
+
+ while (length >= 0) {
+ if (length != status->song)
+ mpd_sendDeleteCommand(c->connection, length);
+
+ length--;
+ }
+
+ mpd_sendCommandListEnd(c->connection);
+ mpd_freeStatus(status);
+ } else {
+ mpd_freeStatus(status);
+ screen_status_message("You need to be playing to crop the playlist\n");
+ }
+
+ return mpdclient_finish_command(c);
+}
+
gint
mpdclient_cmd_stop(mpdclient_t *c)
{
}
gint
-mpdclient_cmd_add(mpdclient_t *c, mpd_Song *song)
+mpdclient_cmd_add(mpdclient_t *c, struct mpd_song *song)
{
gint retval = 0;
#ifdef ENABLE_FANCY_PLAYLIST_MANAGMENT_CMD_ADD
/* add the song to playlist */
- c->playlist.list = g_list_append(c->playlist.list, mpd_songDup(song));
- c->playlist.length++;
+ playlist_append(&c->playlist, song);
/* increment the playlist id, so we dont retrives a new playlist */
c->playlist.id++;
}
gint
-mpdclient_cmd_delete(mpdclient_t *c, gint index)
+mpdclient_cmd_delete(mpdclient_t *c, gint idx)
{
gint retval = 0;
- mpd_Song *song = playlist_get_song(c, index);
+ struct mpd_song *song;
- if( !song )
+ 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, index);
+ mpd_sendDeleteCommand(c->connection, idx);
#endif
if( (retval=mpdclient_finish_command(c)) )
return retval;
c->playlist.id++;
/* remove the song from the playlist */
- c->playlist.list = g_list_remove(c->playlist.list, (gpointer) song);
- c->playlist.length = g_list_length(c->playlist.list);
+ playlist_remove_reuse(&c->playlist, idx);
/* call playlist updated callback */
mpdclient_playlist_callback(c, PLAYLIST_EVENT_DELETE, (gpointer) song);
c->need_update = TRUE;
}
- /* free song */
mpd_freeSong(song);
#else
gint
mpdclient_cmd_move(mpdclient_t *c, gint old_index, gint new_index)
{
- gint n, index1, index2;
- GList *item1, *item2;
- gpointer data1, data2;
- mpd_Song *song1, *song2;
+ gint n;
+ struct mpd_song *song1, *song2;
if (old_index == new_index || new_index < 0 ||
- new_index >= c->playlist.length)
+ (guint)new_index >= c->playlist.list->len)
return -1;
- song1 = playlist_get_song(c, old_index);
- song2 = playlist_get_song(c, new_index);
+ song1 = playlist_get(&c->playlist, old_index);
+ song2 = playlist_get(&c->playlist, new_index);
/* send the move command to mpd */
#ifdef ENABLE_SONG_ID
return n;
#ifdef ENABLE_FANCY_PLAYLIST_MANAGMENT_CMD_MOVE
- /* update the songs position field */
- n = song1->pos;
- song1->pos = song2->pos;
- song2->pos = n;
- index1 = MIN(old_index, new_index);
- index2 = MAX(old_index, new_index);
- /* retreive the list items */
- item1 = g_list_nth(c->playlist.list, index1);
- item2 = g_list_nth(c->playlist.list, index2);
- /* retrieve the songs */
- data1 = item1->data;
- data2 = item2->data;
-
- /* move the second item */
- c->playlist.list = g_list_remove(c->playlist.list, data2);
- c->playlist.list = g_list_insert_before(c->playlist.list, item1, data2);
-
- /* move the first item */
- if (index2-index1 > 1) {
- item2 = g_list_nth(c->playlist.list, index2);
- c->playlist.list = g_list_remove(c->playlist.list, data1);
- c->playlist.list = g_list_insert_before(c->playlist.list,
- item2, data1);
- }
+ /* update the playlist */
+ playlist_swap(&c->playlist, old_index, new_index);
/* increment the playlist id, so we dont retrives a new playlist */
c->playlist.id++;
/*** Playlist managment functions *******************************************/
/****************************************************************************/
-gint
-mpdclient_playlist_free(mpdclient_playlist_t *playlist)
-{
- GList *list = g_list_first(playlist->list);
-
- while(list)
- {
- mpd_Song *song = (mpd_Song *) list->data;
- mpd_freeSong(song);
- list=list->next;
- }
- g_list_free(playlist->list);
- memset(playlist, 0, sizeof(mpdclient_playlist_t));
- return 0;
-}
/* update playlist */
gint
if (MPD_ERROR(c))
return -1;
- if (c->playlist.list)
- mpdclient_playlist_free(&c->playlist);
+ playlist_clear(&c->playlist);
mpd_sendPlaylistInfoCommand(c->connection,-1);
while ((entity = mpd_getNextInfoEntity(c->connection))) {
- if (entity->type == MPD_INFO_ENTITY_TYPE_SONG) {
- mpd_Song *song = mpd_songDup(entity->info.song);
+ if (entity->type == MPD_INFO_ENTITY_TYPE_SONG)
+ playlist_append(&c->playlist, entity->info.song);
- c->playlist.list = g_list_append(c->playlist.list,
- (gpointer)song);
- c->playlist.length++;
- }
mpd_freeInfoEntity(entity);
}
c->playlist.id = c->status->playlist;
c->song = NULL;
- c->playlist.updated = TRUE;
/* call playlist updated callbacks */
mpdclient_playlist_callback(c, PLAYLIST_EVENT_UPDATED, NULL);
mpd_sendPlChangesCommand(c->connection, c->playlist.id);
while ((entity = mpd_getNextInfoEntity(c->connection)) != NULL) {
- mpd_Song *song = entity->info.song;
-
- if (song->pos < c->playlist.length) {
- GList *item = g_list_nth(c->playlist.list, song->pos);
+ struct mpd_song *song = entity->info.song;
+ if (song->pos >= 0 && (guint)song->pos < c->playlist.list->len) {
/* update song */
- D("updating pos:%d, id=%d [%p] - %s\n",
- song->pos, song->id, item, song->file);
- mpd_freeSong((mpd_Song *) item->data);
- item->data = mpd_songDup(song);
+ D("updating pos:%d, id=%d - %s\n",
+ song->pos, song->id, song->file);
+ playlist_replace(&c->playlist, song->pos, song);
} else {
/* add a new song */
D("adding song at pos %d\n", song->pos);
- c->playlist.list = g_list_append(c->playlist.list,
- (gpointer)mpd_songDup(song));
+ playlist_append(&c->playlist, song);
}
+
+ mpd_freeInfoEntity(entity);
}
/* remove trailing songs */
- while (c->status->playlistLength < c->playlist.length) {
- GList *item = g_list_last(c->playlist.list);
+ while ((guint)c->status->playlistLength < c->playlist.list->len) {
+ guint pos = c->playlist.list->len - 1;
/* Remove the last playlist entry */
- D("removing song at pos %d\n", ((mpd_Song *) item->data)->pos);
- mpd_freeSong((mpd_Song *) item->data);
- c->playlist.list = g_list_delete_link(c->playlist.list, item);
- c->playlist.length = g_list_length(c->playlist.list);
+ D("removing song at pos %d\n", pos);
+ playlist_remove(&c->playlist, pos);
}
c->song = NULL;
c->playlist.id = c->status->playlist;
- c->playlist.updated = TRUE;
- c->playlist.length = g_list_length(c->playlist.list);
mpdclient_playlist_callback(c, PLAYLIST_EVENT_UPDATED, NULL);
}
#endif
-mpd_Song *
-playlist_get_song(mpdclient_t *c, gint index)
-{
- return (mpd_Song *) g_list_nth_data(c->playlist.list, index);
-}
-
-GList *
-playlist_lookup(mpdclient_t *c, int id)
-{
- GList *list = g_list_first(c->playlist.list);
-
- while (list) {
- mpd_Song *song = (mpd_Song *) list->data;
- if( song->id == id )
- return list;
- list=list->next;
- }
-
- return NULL;
-}
-
-mpd_Song *
-playlist_lookup_song(mpdclient_t *c, gint id)
-{
- GList *list = c->playlist.list;
-
- while (list) {
- mpd_Song *song = (mpd_Song *) list->data;
- if (song->id == id)
- return song;
- list=list->next;
- }
-
- return NULL;
-}
-
-gint
-playlist_get_index(mpdclient_t *c, mpd_Song *song)
-{
- return g_list_index(c->playlist.list, song);
-}
-
-gint
-playlist_get_index_from_id(mpdclient_t *c, gint id)
-{
- return g_list_index(c->playlist.list, playlist_lookup_song(c, id));
-}
-
-gint
-playlist_get_index_from_file(mpdclient_t *c, gchar *filename)
-{
- GList *list = c->playlist.list;
- gint i=0;
-
- while( list )
- {
- mpd_Song *song = (mpd_Song *) list->data;
- if( strcmp(song->file, filename ) == 0 )
- return i;
- list=list->next;
- i++;
- }
- return -1;
-}
-
/****************************************************************************/
/*** Filelist functions *****************************************************/
/****************************************************************************/
mpdclient_filelist_t *
-mpdclient_filelist_free(mpdclient_filelist_t *filelist)
+mpdclient_filelist_get(mpdclient_t *c, const gchar *path)
{
- GList *list = g_list_first(filelist->list);
-
- D("mpdclient_filelist_free()\n");
- if( list == NULL )
- return NULL;
- while( list!=NULL )
- {
- filelist_entry_t *entry = list->data;
-
- if( entry->entity )
- mpd_freeInfoEntity(entry->entity);
- g_free(entry);
- list=list->next;
- }
- g_list_free(filelist->list);
- g_free(filelist->path);
- filelist->path = NULL;
- filelist->list = NULL;
- filelist->length = 0;
- g_free(filelist);
+ mpdclient_filelist_t *filelist;
+ mpd_InfoEntity *entity;
+ gchar *path_utf8 = locale_to_utf8(path);
+ gboolean has_dirs_only = TRUE;
- return NULL;
-}
+ D("mpdclient_filelist_get(%s)\n", path);
+ mpd_sendLsInfoCommand(c->connection, path_utf8);
+ filelist = filelist_new(path);
+ if (path && path[0] && strcmp(path, "/"))
+ /* add a dummy entry for ./.. */
+ filelist_append(filelist, NULL);
+ while ((entity=mpd_getNextInfoEntity(c->connection))) {
+ filelist_append(filelist, entity);
-mpdclient_filelist_t *
-mpdclient_filelist_get(mpdclient_t *c, const gchar *path)
-{
- mpdclient_filelist_t *filelist;
- mpd_InfoEntity *entity;
- gchar *path_utf8 = locale_to_utf8(path);
- gboolean has_dirs_only = TRUE;
+ if (has_dirs_only && entity->type != MPD_INFO_ENTITY_TYPE_DIRECTORY) {
+ has_dirs_only = FALSE;
+ }
+ }
- D("mpdclient_filelist_get(%s)\n", path);
- mpd_sendLsInfoCommand(c->connection, path_utf8);
- filelist = g_malloc0(sizeof(mpdclient_filelist_t));
- if( path && path[0] && strcmp(path, "/") )
- {
- /* add a dummy entry for ./.. */
- filelist_entry_t *entry = g_malloc0(sizeof(filelist_entry_t));
- entry->entity = NULL;
- filelist->list = g_list_append(filelist->list, (gpointer) entry);
- filelist->length++;
- }
+ /* If there's an error, ignore it. We'll return an empty filelist. */
+ mpdclient_finish_command(c);
- while( (entity=mpd_getNextInfoEntity(c->connection)) )
- {
- filelist_entry_t *entry = g_malloc0(sizeof(filelist_entry_t));
-
- entry->entity = entity;
- filelist->list = g_list_append(filelist->list, (gpointer) entry);
- filelist->length++;
+ g_free(path_utf8);
+ filelist->updated = TRUE;
- if (has_dirs_only && entity->type != MPD_INFO_ENTITY_TYPE_DIRECTORY)
- {
- has_dirs_only = FALSE;
+ // 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);
}
- }
-
- /* If there's an error, ignore it. We'll return an empty filelist. */
- mpdclient_finish_command(c);
-
- g_free(path_utf8);
- filelist->path = g_strdup(path);
- 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->list = g_list_sort(filelist->list, compare_filelistentry_dir);
- }
-
- return filelist;
+ return filelist;
}
mpdclient_filelist_t *
-mpdclient_filelist_search_utf8(mpdclient_t *c,
+mpdclient_filelist_search_utf8(mpdclient_t *c,
int exact_match,
- int table,
+ int table,
gchar *filter_utf8)
{
- mpdclient_filelist_t *filelist;
- mpd_InfoEntity *entity;
+ mpdclient_filelist_t *filelist;
+ mpd_InfoEntity *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 = g_malloc0(sizeof(mpdclient_filelist_t));
+ 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);
- while( (entity=mpd_getNextInfoEntity(c->connection)) )
- {
- filelist_entry_t *entry = g_malloc0(sizeof(filelist_entry_t));
-
- entry->entity = entity;
- filelist->list = g_list_append(filelist->list, (gpointer) entry);
- filelist->length++;
- }
-
- if( mpdclient_finish_command(c) )
- return mpdclient_filelist_free(filelist);
+ while ((entity=mpd_getNextInfoEntity(c->connection)))
+ filelist_append(filelist, entity);
- filelist->updated = TRUE;
+ if (mpdclient_finish_command(c)) {
+ filelist_free(filelist);
+ return NULL;
+ }
- return filelist;
+ filelist->updated = TRUE;
+ return filelist;
}
mpdclient_filelist_search(mpdclient_t *c,
int exact_match,
int table,
- gchar *filter)
+ gchar *_filter)
{
mpdclient_filelist_t *filelist;
- gchar *filter_utf8 = locale_to_utf8(filter);
+ gchar *filter_utf8 = locale_to_utf8(_filter);
- D("mpdclient_filelist_search(%s)\n", filter);
+ D("mpdclient_filelist_search(%s)\n", _filter);
filelist = mpdclient_filelist_search_utf8(c, exact_match, table,
filter_utf8);
g_free(filter_utf8);
{
gchar *path = g_strdup(filelist->path);
- filelist = mpdclient_filelist_free(filelist);
+ filelist_free(filelist);
filelist = mpdclient_filelist_get(c, path);
g_free(path);
return filelist;
return NULL;
}
-filelist_entry_t *
-mpdclient_filelist_find_song(mpdclient_filelist_t *fl, mpd_Song *song)
-{
- GList *list = g_list_first(fl->list);
-
- while( list && song)
- {
- filelist_entry_t *entry = list->data;
- mpd_InfoEntity *entity = entry->entity;
-
- if( entity && entity->type==MPD_INFO_ENTITY_TYPE_SONG )
- {
- mpd_Song *song2 = entity->info.song;
-
- if( strcmp(song->file, song2->file) == 0 )
- {
- return entry;
- }
- }
- list = list->next;
- }
- return NULL;
-}
-
int
mpdclient_filelist_add_all(mpdclient_t *c, mpdclient_filelist_t *fl)
{
- GList *list = g_list_first(fl->list);
-
- if( fl->list==NULL || fl->length<1 )
- return 0;
-
- mpd_sendCommandListBegin(c->connection);
- while( list )
- {
- filelist_entry_t *entry = list->data;
- mpd_InfoEntity *entity = entry->entity;
-
- if( entity && entity->type==MPD_INFO_ENTITY_TYPE_SONG )
- {
- mpd_Song *song = entity->info.song;
-
- mpd_sendAddCommand(c->connection, song->file);
- }
- list = list->next;
- }
- mpd_sendCommandListEnd(c->connection);
- return mpdclient_finish_command(c);
-}
-
+ guint i;
+ if (filelist_is_empty(fl))
+ return 0;
+ mpd_sendCommandListBegin(c->connection);
+ for (i = 0; i < filelist_length(fl); ++i) {
+ filelist_entry_t *entry = filelist_get(fl, i);
+ mpd_InfoEntity *entity = entry->entity;
+ if (entity && entity->type == MPD_INFO_ENTITY_TYPE_SONG) {
+ struct mpd_song *song = entity->info.song;
+ mpd_sendAddCommand(c->connection, song->file);
+ }
+ }
+ mpd_sendCommandListEnd(c->connection);
+ return mpdclient_finish_command(c);
+}
GList *
mpdclient_get_artists_utf8(mpdclient_t *c)