From: Max Kellermann <max@duempel.org>
Date: Tue, 16 Sep 2008 17:11:39 +0000 (+0200)
Subject: mpdclient: added mpdclient_playlist_init(), mpdclient_playlist_clear()
X-Git-Tag: v0.12_alpha1~291
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a6858acfdead6285a010a31b1fc7c8a730e91788;p=ncmpc.git

mpdclient: added mpdclient_playlist_init(), mpdclient_playlist_clear()

Moved code from mpdclient_new() and mpdclient_playlist_free().  In
mpdclient_disconnect(), call mpdclient_playlist_clear() instead of
mpdclient_playlist_free() (which is now called in mpdclient_free()).
---

diff --git a/src/mpdclient.c b/src/mpdclient.c
index 1d52aeb..8449ca4 100644
--- a/src/mpdclient.c
+++ b/src/mpdclient.c
@@ -163,7 +163,7 @@ mpdclient_new(void)
 	mpdclient_t *c;
 
 	c = g_malloc0(sizeof(mpdclient_t));
-	c->playlist.list = g_array_sized_new(FALSE, FALSE, sizeof(struct mpd_song *), 1024);
+	playlist_init(&c->playlist);
 
 	return c;
 }
@@ -172,6 +172,9 @@ mpdclient_t *
 mpdclient_free(mpdclient_t *c)
 {
 	mpdclient_disconnect(c);
+
+	mpdclient_playlist_free(&c->playlist);
+
 	g_list_free(c->error_callbacks);
 	g_list_free(c->playlist_callbacks);
 	g_list_free(c->browse_callbacks);
@@ -191,8 +194,7 @@ mpdclient_disconnect(mpdclient_t *c)
 		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;
diff --git a/src/playlist.c b/src/playlist.c
index e253043..b600343 100644
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -29,8 +29,17 @@
 
 #define MPD_ERROR(c) (c==NULL || c->connection==NULL || c->connection->error)
 
-gint
-mpdclient_playlist_free(mpdclient_playlist_t *playlist)
+void
+playlist_init(struct mpdclient_playlist *playlist)
+{
+	playlist->id = 0;
+	playlist->updated = FALSE;
+	playlist->list = g_array_sized_new(FALSE, FALSE,
+					   sizeof(struct mpd_song *), 1024);
+}
+
+void
+playlist_clear(struct mpdclient_playlist *playlist)
 {
 	guint i;
 
@@ -39,7 +48,17 @@ mpdclient_playlist_free(mpdclient_playlist_t *playlist)
 		mpd_freeSong(song);
 	}
 
-	g_array_free(playlist->list, TRUE);
+	g_array_set_size(playlist->list, 0);
+}
+
+gint
+mpdclient_playlist_free(mpdclient_playlist_t *playlist)
+{
+	if (playlist->list != NULL) {
+		playlist_clear(playlist);
+		g_array_free(playlist->list, TRUE);
+	}
+
 	memset(playlist, 0, sizeof(mpdclient_playlist_t));
 	return 0;
 }
diff --git a/src/playlist.h b/src/playlist.h
index 2d2a353..946ca63 100644
--- a/src/playlist.h
+++ b/src/playlist.h
@@ -39,6 +39,13 @@ typedef struct mpdclient_playlist {
 	GArray *list;
 } mpdclient_playlist_t;
 
+void
+playlist_init(struct mpdclient_playlist *playlist);
+
+/** remove and free all songs in the playlist */
+void
+playlist_clear(struct mpdclient_playlist *playlist);
+
 /* free a playlist */
 gint mpdclient_playlist_free(mpdclient_playlist_t *playlist);