screen_artist: tracks w/o album tag != all tracks

[ncmpc.git] / src / playlist.c

diff --git a/src/playlist.c b/src/playlist.c
index 713d3c69fc4b7902c17a45b32d1dc152778f8a00..c95f447080d7dab9bafa61afd556f22afc7f74de 100644 (file)
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -1,5 +1,5 @@
 /* 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
@@ -18,18 +18,13 @@
 */
 
 #include "playlist.h"
-#include "mpdclient.h"
 
 #include <string.h>
 
-#define ENABLE_PLCHANGES
-
-#define MPD_ERROR(c) (c==NULL || c->connection==NULL || c->connection->error)
-
 void
 playlist_init(struct mpdclient_playlist *playlist)
 {
-       playlist->id = 0;
+       playlist->version = 0;
        playlist->list = g_ptr_array_sized_new(1024);
 }
 
@@ -38,7 +33,7 @@ playlist_clear(struct mpdclient_playlist *playlist)
 {
        guint i;
 
-       playlist->id = 0;
+       playlist->version = 0;
 
        for (i = 0; i < playlist->list->len; ++i) {
                struct mpd_song *song = playlist_get(playlist, i);
@@ -61,22 +56,46 @@ mpdclient_playlist_free(struct mpdclient_playlist *playlist)
        return 0;
 }
 
-struct mpd_song *
-playlist_get_song(struct mpdclient *c, gint idx)
+const struct mpd_song *
+playlist_get_song(const struct mpdclient_playlist *playlist, gint idx)
 {
-       if (idx < 0 || (guint)idx >= c->playlist.list->len)
+       if (idx < 0 || (guint)idx >= playlist_length(playlist))
                return NULL;
 
-       return playlist_get(&c->playlist, idx);
+       return playlist_get(playlist, idx);
 }
 
-struct mpd_song *
-playlist_lookup_song(struct mpdclient *c, unsigned id)
+void
+playlist_move(struct mpdclient_playlist *playlist,
+             unsigned dest, unsigned src)
 {
-       guint i;
+       struct mpd_song *song;
+
+       assert(playlist != NULL);
+       assert(src < playlist_length(playlist));
+       assert(dest < playlist_length(playlist));
+       assert(src != dest);
+
+       song = playlist_get(playlist, src);
+
+       if (src < dest) {
+               memmove(&playlist->list->pdata[src],
+                       &playlist->list->pdata[src + 1],
+                       sizeof(playlist->list->pdata[0]) * (dest - src));
+               playlist->list->pdata[dest] = song;
+       } else {
+               memmove(&playlist->list->pdata[dest + 1],
+                       &playlist->list->pdata[dest],
+                       sizeof(playlist->list->pdata[0]) * (src - dest));
+               playlist->list->pdata[dest] = song;
+       }
+}
 
-       for (i = 0; i < c->playlist.list->len; ++i) {
-               struct mpd_song *song = playlist_get(&c->playlist, i);
+const struct mpd_song *
+playlist_lookup_song(const struct mpdclient_playlist *playlist, unsigned id)
+{
+       for (guint i = 0; i < playlist_length(playlist); ++i) {
+               struct mpd_song *song = playlist_get(playlist, i);
                if (mpd_song_get_id(song) == id)
                        return song;
        }
@@ -85,12 +104,11 @@ playlist_lookup_song(struct mpdclient *c, unsigned id)
 }
 
 gint
-playlist_get_index(const struct mpdclient *c, const struct mpd_song *song)
+playlist_get_index(const struct mpdclient_playlist *playlist,
+                  const struct mpd_song *song)
 {
-       guint i;
-
-       for (i = 0; i < c->playlist.list->len; ++i) {
-               if (playlist_get(&c->playlist, i) == song)
+       for (guint i = 0; i < playlist_length(playlist); ++i) {
+               if (playlist_get(playlist, i) == song)
                        return (gint)i;
        }
 
@@ -98,12 +116,11 @@ playlist_get_index(const struct mpdclient *c, const struct mpd_song *song)
 }
 
 gint
-playlist_get_index_from_id(const struct mpdclient *c, unsigned id)
+playlist_get_index_from_id(const struct mpdclient_playlist *playlist,
+                          unsigned id)
 {
-       guint i;
-
-       for (i = 0; i < c->playlist.list->len; ++i) {
-               const struct mpd_song *song = playlist_get(&c->playlist, i);
+       for (guint i = 0; i < playlist_length(playlist); ++i) {
+               const struct mpd_song *song = playlist_get(playlist, i);
                if (mpd_song_get_id(song) == id)
                        return (gint)i;
        }
@@ -112,12 +129,11 @@ playlist_get_index_from_id(const struct mpdclient *c, unsigned id)
 }
 
 gint
-playlist_get_index_from_file(const struct mpdclient *c, const gchar *filename)
+playlist_get_index_from_file(const struct mpdclient_playlist *playlist,
+                            const gchar *filename)
 {
-       guint i;
-
-       for (i = 0; i < c->playlist.list->len; ++i) {
-               const struct mpd_song *song = playlist_get(&c->playlist, i);
+       for (guint i = 0; i < playlist_length(playlist); ++i) {
+               const struct mpd_song *song = playlist_get(playlist, i);
 
                if (strcmp(mpd_song_get_uri(song), filename) == 0)
                        return (gint)i;
@@ -125,3 +141,17 @@ playlist_get_index_from_file(const struct mpdclient *c, const gchar *filename)
 
        return -1;
 }
+
+gint
+playlist_get_id_from_uri(const struct mpdclient_playlist *playlist,
+                        const gchar *uri)
+{
+       for (guint i = 0; i < playlist_length(playlist); ++i) {
+               const struct mpd_song *song = playlist_get(playlist, i);
+
+               if (strcmp(mpd_song_get_uri(song), uri) == 0)
+                       return mpd_song_get_id(song);
+       }
+
+       return -1;
+}