From dfae74dd50c5d834c4efcabdad84ec16325f7b77 Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Mon, 2 May 2016 08:42:28 -0400 Subject: [PATCH] gui/playlist: Set gui queue name based on passed playlist Signed-off-by: Anna Schumaker --- gui/playlist.c | 12 +++++++----- include/core/playlist.h | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gui/playlist.c b/gui/playlist.c index e46ad796..1f99f54b 100644 --- a/gui/playlist.c +++ b/gui/playlist.c @@ -72,7 +72,7 @@ void __playlist_selection_changed(GtkTreeSelection *selection, gpointer data) } } -static void __playlist_update_sizes() +static void __playlist_update_sizes(struct queue *queue) { GtkTreeModel *model = GTK_TREE_MODEL(p_store); GtkTreeIter parent, iter; @@ -86,26 +86,28 @@ static void __playlist_update_sizes() do { name = __playlist_name(&iter); - __playlist_set_size(&iter, name); + if (string_match(name, gui_queue(queue)->gq_text)) + __playlist_set_size(&iter, name); g_free(name); } while (gtk_tree_model_iter_next(model, &iter)); } static void *__playlist_init(struct queue *queue, void *data) { - return gui_queue_alloc(queue, "Playlist", 0); + struct playlist *playlist = (struct playlist *)data; + return gui_queue_alloc(queue, playlist->pl_name, 0); } static void __playlist_added(struct queue *queue, unsigned int row) { gui_queue_added(queue, row); - __playlist_update_sizes(); + __playlist_update_sizes(queue); } static void __playlist_removed(struct queue *queue, unsigned int row) { gui_queue_removed(queue, row); - __playlist_update_sizes(); + __playlist_update_sizes(queue); } static bool __playlist_erase(struct queue *queue, struct track *track) diff --git a/include/core/playlist.h b/include/core/playlist.h index 1fbcc937..7b6d7d05 100644 --- a/include/core/playlist.h +++ b/include/core/playlist.h @@ -8,6 +8,7 @@ #ifndef OCARINA_CORE_PLAYLIST_H #define OCARINA_CORE_PLAYLIST_H +#include #include