X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fscreen_artist.c;h=a3bda330ef9fb22877fe6ce3347418d46837cfe1;hb=cc870588d2c2ac48a9cac85e7c2b1630a516fb03;hp=a1ba4691a37e7f2481dd5ea2e7b84ca1e1a34ec1;hpb=2d5758c66089501bd41015c718dfb3eeb934373f;p=ncmpc.git

diff --git a/src/screen_artist.c b/src/screen_artist.c
index a1ba469..a3bda33 100644
--- a/src/screen_artist.c
+++ b/src/screen_artist.c
@@ -46,11 +46,12 @@ static struct screen_browser browser;
 static gint
 compare_utf8(gconstpointer s1, gconstpointer s2)
 {
+	const char *const*t1 = s1, *const*t2 = s2;
 	char *key1, *key2;
 	int n;
 
-	key1 = g_utf8_collate_key(s1,-1);
-	key2 = g_utf8_collate_key(s2,-1);
+	key1 = g_utf8_collate_key(*t1,-1);
+	key2 = g_utf8_collate_key(*t2,-1);
 	n = strcmp(key1,key2);
 	g_free(key1);
 	g_free(key2);
@@ -59,8 +60,7 @@ compare_utf8(gconstpointer s1, gconstpointer s2)
 
 /* list_window callback */
 static const char *
-screen_artist_lw_callback(unsigned idx, G_GNUC_UNUSED bool *highlight,
-			  G_GNUC_UNUSED char** sc, G_GNUC_UNUSED void *data)
+screen_artist_lw_callback(unsigned idx, void *data)
 {
 	GPtrArray *list = data;
 	static char buf[BUFSIZE];
@@ -101,21 +101,6 @@ artist_repaint(void)
 	wrefresh(browser.lw->w);
 }
 
-static GPtrArray *
-g_list_to_ptr_array(GList *in)
-{
-	GPtrArray *out = g_ptr_array_sized_new(g_list_length(in));
-	GList *head = in;
-
-	while (in != NULL) {
-		g_ptr_array_add(out, in->data);
-		in = g_list_next(in);
-	}
-
-	g_list_free(head);
-	return out;
-}
-
 static void
 string_array_free(GPtrArray *array)
 {
@@ -130,7 +115,7 @@ string_array_free(GPtrArray *array)
 }
 
 static void
-free_lists(G_GNUC_UNUSED struct mpdclient *c)
+free_lists(void)
 {
 	if (artist_list != NULL) {
 		string_array_free(artist_list);
@@ -148,10 +133,22 @@ free_lists(G_GNUC_UNUSED struct mpdclient *c)
 	}
 }
 
+static void
+recv_tag_values(struct mpd_connection *connection, enum mpd_tag_type tag,
+		GPtrArray *list)
+{
+	struct mpd_pair *pair;
+
+	while ((pair = mpd_recv_pair_tag(connection, tag)) != NULL) {
+		g_ptr_array_add(list, g_strdup(pair->value));
+		mpd_return_pair(connection, pair);
+	}
+}
+
 static void
 load_artist_list(struct mpdclient *c)
 {
-	GList *list;
+	struct mpd_connection *connection = mpdclient_get_connection(c);
 
 	assert(mode == LIST_ARTISTS);
 	assert(artist == NULL);
@@ -160,18 +157,26 @@ load_artist_list(struct mpdclient *c)
 	assert(album_list == NULL);
 	assert(browser.filelist == NULL);
 
-	list = mpdclient_get_artists(c);
-	/* sort list */
-	list = g_list_sort(list, compare_utf8);
+	artist_list = g_ptr_array_new();
+
+	if (connection != NULL) {
+		mpd_search_db_tags(connection, MPD_TAG_ARTIST);
+		mpd_search_commit(connection);
+		recv_tag_values(connection, MPD_TAG_ARTIST, artist_list);
+
+		if (!mpd_response_finish(connection))
+			mpdclient_handle_error(c);
+	}
 
-	artist_list = g_list_to_ptr_array(list);
+	/* sort list */
+	g_ptr_array_sort(artist_list, compare_utf8);
 	list_window_set_length(browser.lw, artist_list->len);
 }
 
 static void
 load_album_list(struct mpdclient *c)
 {
-	GList *list;
+	struct mpd_connection *connection = mpdclient_get_connection(c);
 
 	assert(mode == LIST_ALBUMS);
 	assert(artist != NULL);
@@ -179,11 +184,24 @@ load_album_list(struct mpdclient *c)
 	assert(album_list == NULL);
 	assert(browser.filelist == NULL);
 
-	list = mpdclient_get_albums(c, artist);
+	album_list = g_ptr_array_new();
+
+	if (connection != NULL) {
+		mpd_search_db_tags(connection, MPD_TAG_ALBUM);
+		mpd_search_add_tag_constraint(connection,
+					      MPD_OPERATOR_DEFAULT,
+					      MPD_TAG_ARTIST, artist);
+		mpd_search_commit(connection);
+
+		recv_tag_values(connection, MPD_TAG_ALBUM, album_list);
+
+		if (!mpd_response_finish(connection))
+			mpdclient_handle_error(c);
+	}
+
 	/* sort list */
-	list = g_list_sort(list, compare_utf8);
+	g_ptr_array_sort(album_list, compare_utf8);
 
-	album_list = g_list_to_ptr_array(list);
 	list_window_set_length(browser.lw, album_list->len + 2);
 }
 
@@ -197,22 +215,24 @@ load_song_list(struct mpdclient *c)
 	assert(album != NULL);
 	assert(browser.filelist == NULL);
 
-	mpd_search_db_songs(connection, true);
-	mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT,
-				      MPD_TAG_ARTIST, artist);
-	if (album[0] != 0)
-		mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT,
-					      MPD_TAG_ALBUM, album);
-	mpd_search_commit(connection);
-
 	browser.filelist = filelist_new();
 	/* add a dummy entry for ".." */
 	filelist_append(browser.filelist, NULL);
 
-	filelist_recv(browser.filelist, connection);
+	if (connection != NULL) {
+		mpd_search_db_songs(connection, true);
+		mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT,
+					      MPD_TAG_ARTIST, artist);
+		if (album[0] != 0)
+			mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT,
+						      MPD_TAG_ALBUM, album);
+		mpd_search_commit(connection);
 
-	if (!mpd_response_finish(connection))
-		mpdclient_handle_error(c);
+		filelist_recv(browser.filelist, connection);
+
+		if (!mpd_response_finish(connection))
+			mpdclient_handle_error(c);
+	}
 
 #ifndef NCMPC_MINI
 	/* fix highlights */
@@ -222,20 +242,20 @@ load_song_list(struct mpdclient *c)
 }
 
 static void
-free_state(struct mpdclient *c)
+free_state(void)
 {
 	g_free(artist);
 	g_free(album);
 	artist = NULL;
 	album = NULL;
 
-	free_lists(c);
+	free_lists();
 }
 
 static void
 open_artist_list(struct mpdclient *c)
 {
-	free_state(c);
+	free_state();
 
 	mode = LIST_ARTISTS;
 	load_artist_list(c);
@@ -246,7 +266,7 @@ open_album_list(struct mpdclient *c, char *_artist)
 {
 	assert(_artist != NULL);
 
-	free_state(c);
+	free_state();
 
 	mode = LIST_ALBUMS;
 	artist = _artist;
@@ -259,7 +279,7 @@ open_song_list(struct mpdclient *c, char *_artist, char *_album)
 	assert(_artist != NULL);
 	assert(_album != NULL);
 
-	free_state(c);
+	free_state();
 
 	mode = LIST_SONGS;
 	artist = _artist;
@@ -270,7 +290,7 @@ open_song_list(struct mpdclient *c, char *_artist, char *_album)
 static void
 reload_lists(struct mpdclient *c)
 {
-	free_lists(c);
+	free_lists();
 
 	switch (mode) {
 	case LIST_ARTISTS:
@@ -298,7 +318,7 @@ screen_artist_init(WINDOW *w, int cols, int rows)
 static void
 screen_artist_quit(void)
 {
-	free_state(NULL);
+	free_state();
 	list_window_free(browser.lw);
 }
 
@@ -320,8 +340,7 @@ static void
 screen_artist_paint(void)
 {
 	if (browser.filelist) {
-		list_window_paint(browser.lw, browser_lw_callback,
-				  browser.filelist);
+		screen_browser_paint(&browser);
 	} else if (album_list != NULL)
 		list_window_paint(browser.lw, screen_artist_lw_callback,
 				  album_list);
@@ -453,6 +472,7 @@ string_array_find(GPtrArray *array, const char *value)
 static bool
 screen_artist_cmd(struct mpdclient *c, command_t cmd)
 {
+	struct list_window_range range;
 	char *selected;
 	char *old;
 	int idx;
@@ -596,8 +616,8 @@ screen_artist_cmd(struct mpdclient *c, command_t cmd)
 			if (browser.lw->selected >= artist_list->len)
 				return true;
 
-			for (unsigned i = browser.lw->selected_start;
-			     i <= browser.lw->selected_end; ++i) {
+			list_window_get_range(browser.lw, &range);
+			for (unsigned i = range.start; i < range.end; ++i) {
 				selected = g_ptr_array_index(artist_list, i);
 				add_query(c, MPD_TAG_ARTIST, selected);
 				cmd = CMD_LIST_NEXT; /* continue and select next item... */
@@ -605,8 +625,8 @@ screen_artist_cmd(struct mpdclient *c, command_t cmd)
 			break;
 
 		case LIST_ALBUMS:
-			for (unsigned i = browser.lw->selected_start;
-			     i <= browser.lw->selected_end; ++i) {
+			list_window_get_range(browser.lw, &range);
+			for (unsigned i = range.start; i < range.end; ++i) {
 				if(i == album_list->len + 1)
 					add_query(c, MPD_TAG_ARTIST, artist);
 				else if (i > 0)
@@ -655,13 +675,13 @@ screen_artist_cmd(struct mpdclient *c, command_t cmd)
 		switch (mode) {
 		case LIST_ARTISTS:
 			screen_jump(browser.lw, screen_artist_lw_callback,
-				    artist_list);
+				    NULL, artist_list);
 			artist_repaint();
 			return true;
 
 		case LIST_ALBUMS:
 			screen_jump(browser.lw, screen_artist_lw_callback,
-				    album_list);
+				    NULL, album_list);
 			artist_repaint();
 			return true;