From 0f5d4e6a344707227ce81c01e6328a852623046e Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Fri, 22 Apr 2016 14:42:25 -0400 Subject: [PATCH] core/playlist: Remove __playlist_fill_static() And other support code for filling the obsolete playlist_q with tracks. Signed-off-by: Anna Schumaker --- core/playlist.c | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/core/playlist.c b/core/playlist.c index a274642d..4c7e4c74 100644 --- a/core/playlist.c +++ b/core/playlist.c @@ -40,17 +40,6 @@ static inline bool __playlist_is_dynamic(enum playlist_t plist) return !__playlist_is_static(plist); } -static void __playlist_fill_static(enum playlist_t plist) -{ - struct queue *queue = __playlist_lookup(playlist_names[plist]); - struct queue_iter it; - - if (queue) { - queue_for_each(queue, &it) - queue_add(&playlist_q, queue_iter_val(&it)); - } -} - static void __playlist_fill_dynamic(enum playlist_t plist) { unsigned int count = 0, average = 0; @@ -156,8 +145,6 @@ bool playlist_add(enum playlist_t plist, struct track *track) return false; queue_add(queue, track); __playlist_save(); - if (playlist_cur == plist) - queue_add(&playlist_q, track); return true; } @@ -173,8 +160,6 @@ bool playlist_remove(enum playlist_t plist, struct track *track) if (!queue_remove_all(queue, track)) return false; __playlist_save(); - if (playlist_cur == plist) - queue_remove_all(&playlist_q, track); return true; } @@ -189,15 +174,15 @@ bool playlist_has(enum playlist_t plist, struct track *track) void playlist_select(enum playlist_t plist) { + playlist_cur = plist; + + if (__playlist_is_static(plist)) + return; + queue_clear(&playlist_q); queue_set_flag(&playlist_q, Q_ADD_FRONT); - if (__playlist_is_static(plist)) - __playlist_fill_static(plist); - else - __playlist_fill_dynamic(plist); + __playlist_fill_dynamic(plist); queue_unset_flag(&playlist_q, Q_ADD_FRONT); - - playlist_cur = plist; queue_resort(&playlist_q); }