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

core/playlist: Remove __playlist_is_{dynamic, static}() functions 

This helps prepare for moving dynamic playlists into the system playlist
code.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker 2016-04-27 16:06:18 -04:00 committed by Anna Schumaker
parent a465577c86
commit 5a0fc355e4
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/playlist.c
View File

@ -6,19 +6,10 @@
static struct queue playlist_q; static struct queue playlist_q;
static enum playlist_t playlist_cur; static enum playlist_t playlist_cur;
static const gchar *playlist_names[2] = { "Favorites", "Banned" }; static const gchar *playlist_names[5] =
{ "Favorites", "Hidden", "Unplayed", "Most Played", "Least Played" };
static inline bool __playlist_is_static(enum playlist_t plist)
{
return (plist == PL_FAVORITED) || (plist == PL_HIDDEN);
}
static inline bool __playlist_is_dynamic(enum playlist_t plist)
{
return !__playlist_is_static(plist);
}
static void __playlist_fill_dynamic(enum playlist_t plist) static void __playlist_fill_dynamic(enum playlist_t plist)
{ {
unsigned int count = 0, average = 0; unsigned int count = 0, average = 0;
@ -58,14 +49,14 @@ void playlist_deinit()
bool playlist_add(enum playlist_t plist, struct track *track) bool playlist_add(enum playlist_t plist, struct track *track)
{ {
if (!track || __playlist_is_dynamic(plist)) if (!track)
return false; return false;
return pl_system.pl_add_track(playlist_names[plist], track); return pl_system.pl_add_track(playlist_names[plist], track);
} }
bool playlist_remove(enum playlist_t plist, struct track *track) bool playlist_remove(enum playlist_t plist, struct track *track)
{ {
if (!track || __playlist_is_dynamic(plist)) if (!track)
return false; return false;
return pl_system.pl_remove_track(playlist_names[plist], track); return pl_system.pl_remove_track(playlist_names[plist], track);
} }
@ -82,7 +73,7 @@ void playlist_select(enum playlist_t plist)
{ {
playlist_cur = plist; playlist_cur = plist;
if (__playlist_is_static(plist)) if (playlist_get_queue(plist) != &playlist_q)
return; return;
queue_clear(&playlist_q); queue_clear(&playlist_q);
@ -94,7 +85,6 @@ void playlist_select(enum playlist_t plist)
struct queue *playlist_get_queue(enum playlist_t plist) struct queue *playlist_get_queue(enum playlist_t plist)
{ {
if (__playlist_is_static(plist)) struct queue *ret = pl_system.pl_get_queue(playlist_names[plist]);
return pl_system.pl_get_queue(playlist_names[plist]); return ret ? ret : &playlist_q;
return &playlist_q;
} }