diff --git a/src/playlist.h b/src/playlist.h
index b94893681aff5af70b7586fabdd452577d05cc04..5b7aeee33842bff67ce37ffa64fbadb30ada2444 100644 (file)
--- a/src/playlist.h
+++ b/src/playlist.h
/* 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 <assert.h>
#include <glib.h>
-struct mpdclient;
-
struct mpdclient_playlist {
- /* playlist id */
- unsigned id;
+ /* queue version number (obtained from mpd_status) */
+ unsigned version;
/* the list */
GPtrArray *list;
mpd_song_free(playlist_remove_reuse(playlist, idx));
}
-static inline void
-playlist_swap(struct mpdclient_playlist *playlist, guint idx1, guint idx2)
-{
- struct mpd_song *song1 = playlist_get(playlist, idx1);
- struct mpd_song *song2 = playlist_get(playlist, idx2);
- int n;
-
- /* update the songs position field */
- n = mpd_song_get_pos(song1);
- mpd_song_set_pos(song1, mpd_song_get_pos(song2));
- mpd_song_set_pos(song2, n);
-
- /* update the array */
- g_ptr_array_index(playlist->list, idx1) = song2;
- g_ptr_array_index(playlist->list, idx2) = song1;
-}
+void
+playlist_move(struct mpdclient_playlist *playlist,
+ unsigned dest, unsigned src);
-struct mpd_song *playlist_lookup_song(struct mpdclient *c, unsigned id);
+const struct mpd_song *
+playlist_lookup_song(const struct mpdclient_playlist *playlist, unsigned id);
-struct mpd_song *playlist_get_song(struct mpdclient *c, gint index);
+const struct mpd_song *
+playlist_get_song(const struct mpdclient_playlist *playlist, gint index);
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);
gint
-playlist_get_index_from_id(const struct mpdclient *c, unsigned id);
+playlist_get_index_from_id(const struct mpdclient_playlist *playlist,
+ 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);
static inline gint
-playlist_get_index_from_same_song(const struct mpdclient *c,
+playlist_get_index_from_same_song(const struct mpdclient_playlist *playlist,
const struct mpd_song *song)
{
- return playlist_get_index_from_file(c, mpd_song_get_uri(song));
+ return playlist_get_index_from_file(playlist, mpd_song_get_uri(song));
+}
+
+gint
+playlist_get_id_from_uri(const struct mpdclient_playlist *playlist,
+ const gchar *uri);
+
+static inline gint
+playlist_get_id_from_same_song(const struct mpdclient_playlist *playlist,
+ const struct mpd_song *song)
+{
+ return playlist_get_id_from_uri(playlist, mpd_song_get_uri(song));
}
#endif