anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

core/playlist: Remove __playlist_fill_static() 

And other support code for filling the obsolete playlist_q with tracks.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker 2016-04-22 14:42:25 -04:00 committed by Anna Schumaker
parent 151c446635
commit 0f5d4e6a34
1 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
core/playlist.c
View File

@ -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);
}