From eee102e5ddd2c400d707bffe21d9c6ec74507371 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 16 Sep 2008 19:11:39 +0200 Subject: [PATCH] mpdclient: moved code to playlist.c Move everything which manipulates the mpdclient_playlist struct to playlist.c. Many of the functions get a mpdclient pointer instead of a playlist; this will be changed later. The functions mpdclient_playlist_update() and mpdclient_playlist_update_changes() stay in mpdclient.c for now, since they are tightly connected to the client code. --- src/Makefile.am | 2 + src/mpdclient.c | 82 ----------------------------------- src/mpdclient.h | 33 ++------------ src/playlist.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++++ src/playlist.h | 55 +++++++++++++++++++++++ 5 files changed, 174 insertions(+), 111 deletions(-) create mode 100644 src/playlist.c create mode 100644 src/playlist.h diff --git a/src/Makefile.am b/src/Makefile.am index 857c97c..21bef4d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,6 +16,7 @@ ncmpc_headers = \ libmpdclient.h\ song.h \ mpdclient.h\ + playlist.h \ easy_download.h\ options.h\ conf.h\ @@ -45,6 +46,7 @@ ncmpc_SOURCES = \ song.c \ main.c\ mpdclient.c\ + playlist.c \ options.c\ conf.c\ command.c\ diff --git a/src/mpdclient.c b/src/mpdclient.c index c570051..1d52aeb 100644 --- a/src/mpdclient.c +++ b/src/mpdclient.c @@ -647,20 +647,6 @@ mpdclient_remove_error_callback(mpdclient_t *c, mpdc_error_cb_t cb) /*** Playlist managment functions *******************************************/ /****************************************************************************/ -gint -mpdclient_playlist_free(mpdclient_playlist_t *playlist) -{ - guint i; - - for (i = 0; i < playlist->list->len; ++i) { - struct mpd_song *song = g_array_index(playlist->list, struct mpd_song *, i); - mpd_freeSong(song); - } - - g_array_free(playlist->list, TRUE); - memset(playlist, 0, sizeof(mpdclient_playlist_t)); - return 0; -} /* update playlist */ gint @@ -759,74 +745,6 @@ mpdclient_playlist_update_changes(mpdclient_t *c) } #endif -struct mpd_song * -playlist_get_song(mpdclient_t *c, gint idx) -{ - if (idx < 0 || (guint)idx >= c->playlist.list->len) - return NULL; - - return g_array_index(c->playlist.list, struct mpd_song *, idx); -} - -struct mpd_song * -playlist_lookup_song(mpdclient_t *c, gint id) -{ - guint i; - - for (i = 0; i < c->playlist.list->len; ++i) { - struct mpd_song *song = g_array_index(c->playlist.list, - struct mpd_song *, i); - if (song->id == id) - return song; - } - - return NULL; -} - -gint -playlist_get_index(mpdclient_t *c, struct mpd_song *song) -{ - guint i; - - for (i = 0; i < c->playlist.list->len; ++i) { - if (g_array_index(c->playlist.list, struct mpd_song *, i) - == song) - return (gint)i; - } - - return -1; -} - -gint -playlist_get_index_from_id(mpdclient_t *c, gint id) -{ - guint i; - - for (i = 0; i < c->playlist.list->len; ++i) { - struct mpd_song *song = g_array_index(c->playlist.list, - struct mpd_song *, i); - if (song->id == id) - return (gint)i; - } - - return -1; -} - -gint -playlist_get_index_from_file(mpdclient_t *c, gchar *filename) -{ - guint i; - - for (i = 0; i < c->playlist.list->len; ++i) { - struct mpd_song *song = g_array_index(c->playlist.list, - struct mpd_song *, i); - if(strcmp(song->file, filename) == 0) - return (gint)i; - } - - return -1; -} - /****************************************************************************/ /*** Filelist functions *****************************************************/ diff --git a/src/mpdclient.h b/src/mpdclient.h index f1b9937..2ce803e 100644 --- a/src/mpdclient.h +++ b/src/mpdclient.h @@ -2,8 +2,7 @@ #define MPDCLIENT_H #include "libmpdclient.h" - -#include +#include "playlist.h" #define MPD_VERSION_EQ(c,x,y,z) (c->connection->version[0] == x && \ c->connection->version[1] == y && \ @@ -14,22 +13,6 @@ (c->connection->version[0]==x && c->connection->version[1]==y && \ c->connection->version[2] + * (c) 2008 Max Kellermann + * + * 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 + * + */ + +#include "playlist.h" +#include "mpdclient.h" +#include "ncmpc.h" + +#include + +#define ENABLE_PLCHANGES + +#define MPD_ERROR(c) (c==NULL || c->connection==NULL || c->connection->error) + +gint +mpdclient_playlist_free(mpdclient_playlist_t *playlist) +{ + guint i; + + for (i = 0; i < playlist->list->len; ++i) { + struct mpd_song *song = g_array_index(playlist->list, struct mpd_song *, i); + mpd_freeSong(song); + } + + g_array_free(playlist->list, TRUE); + memset(playlist, 0, sizeof(mpdclient_playlist_t)); + return 0; +} + +struct mpd_song * +playlist_get_song(mpdclient_t *c, gint idx) +{ + if (idx < 0 || (guint)idx >= c->playlist.list->len) + return NULL; + + return g_array_index(c->playlist.list, struct mpd_song *, idx); +} + +struct mpd_song * +playlist_lookup_song(mpdclient_t *c, gint id) +{ + guint i; + + for (i = 0; i < c->playlist.list->len; ++i) { + struct mpd_song *song = g_array_index(c->playlist.list, + struct mpd_song *, i); + if (song->id == id) + return song; + } + + return NULL; +} + +gint +playlist_get_index(mpdclient_t *c, struct mpd_song *song) +{ + guint i; + + for (i = 0; i < c->playlist.list->len; ++i) { + if (g_array_index(c->playlist.list, struct mpd_song *, i) + == song) + return (gint)i; + } + + return -1; +} + +gint +playlist_get_index_from_id(mpdclient_t *c, gint id) +{ + guint i; + + for (i = 0; i < c->playlist.list->len; ++i) { + struct mpd_song *song = g_array_index(c->playlist.list, + struct mpd_song *, i); + if (song->id == id) + return (gint)i; + } + + return -1; +} + +gint +playlist_get_index_from_file(mpdclient_t *c, gchar *filename) +{ + guint i; + + for (i = 0; i < c->playlist.list->len; ++i) { + struct mpd_song *song = g_array_index(c->playlist.list, + struct mpd_song *, i); + if(strcmp(song->file, filename) == 0) + return (gint)i; + } + + return -1; +} diff --git a/src/playlist.h b/src/playlist.h new file mode 100644 index 0000000..2d2a353 --- /dev/null +++ b/src/playlist.h @@ -0,0 +1,55 @@ +/* + * $Id$ + * + * (c) 2004 by Kalle Wallin + * (c) 2008 Max Kellermann + * + * 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 + * + */ + +#ifndef MPDCLIENT_PLAYLIST_H +#define MPDCLIENT_PLAYLIST_H + +#include "libmpdclient.h" + +#include + +struct mpdclient; + +typedef struct mpdclient_playlist { + /* playlist id */ + long long id; + + /* true if the list is updated */ + gboolean updated; + + /* the list */ + GArray *list; +} mpdclient_playlist_t; + +/* free a playlist */ +gint mpdclient_playlist_free(mpdclient_playlist_t *playlist); + +struct mpd_song *playlist_lookup_song(struct mpdclient *c, gint id); + +struct mpd_song *playlist_get_song(struct mpdclient *c, gint index); + +gint playlist_get_index(struct mpdclient *c, struct mpd_song *song); + +gint playlist_get_index_from_id(struct mpdclient *c, gint id); + +gint playlist_get_index_from_file(struct mpdclient *c, gchar *filename); + +#endif -- 2.30.2