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

core/playlist: Move dynamic playlists out of the PlaylistQueue class 

This lets me remove the PlaylistQueue entirely.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker 2015-12-10 10:55:53 -05:00
parent 7a32fdb982
commit 135e0d95d6
1 changed files with 58 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
core/playlist.cpp
View File

@ -7,68 +7,15 @@ extern "C" {
}
#include <core/playlist.h>
class PlaylistQueue : public queue {
public:
void clear()
{
queue_clear(this);
}
unsigned int find_average_count()
{
struct db_entry *track, *next;
unsigned int total = 0, count = 0;
db_for_each(track, next, track_db_get()) {
total += TRACK(track)->tr_count;
count++;
}
if (count > 0)
return total / count;
return 0;
}
void dynamic_add(const std::string &name, struct track *track, unsigned int avg)
{
if ((name == "Unplayed") && (track->tr_count == 0))
queue_add(this, track);
if ((name == "Most Played") && (track->tr_count > avg))
queue_add(this, track);
if ((name == "Least Played") && (track->tr_count < avg) &&
(track->tr_count > 0))
queue_add(this, track);
}
void dynamic_fill(const std::string &name)
{
struct db_entry *track, *next;
unsigned int avg = 0;
if ((name == "Most Played") || (name == "Least Played"))
avg = find_average_count();
clear();
queue_set_flag(this, Q_ADD_FRONT);
db_for_each(track, next, track_db_get())
dynamic_add(name, TRACK(track), avg);
queue_unset_flag(this, Q_ADD_FRONT);
queue_resort(this);
}
};
static struct database playlist_db;
static PlaylistQueue playlist_q;
static struct queue playlist_q;
static std::string cur_plist;
static inline bool __playlist_is_static(const gchar *name)
{
if (!name)
return false;
if (string_compare(name, "Favorites") == 0)
return true;
return string_compare(name, "Banned") == 0;
@ -76,6 +23,8 @@ static inline bool __playlist_is_static(const gchar *name)
static inline bool __playlist_is_dynamic(const gchar *name)
{
if (!name)
return false;
if (string_compare(name, "Most Played") == 0)
return true;
if (string_compare(name, "Least Played") == 0)
@ -83,6 +32,19 @@ static inline bool __playlist_is_dynamic(const gchar *name)
return string_compare(name, "Unplayed") == 0;
}
static unsigned int __playlist_find_average()
{
struct db_entry *track, *next;
unsigned int total = 0;
if (track_db_get()->db_size == 0)
return 0;
db_for_each(track, next, track_db_get())
total += TRACK(track)->tr_count;
return total / track_db_get()->db_size;
}
static void __playlist_fill(const gchar *name, struct set *set)
{
struct set_iter it;
@ -101,6 +63,40 @@ static void __playlist_fill(const gchar *name, struct set *set)
queue_resort(&playlist_q);
}
static void __playlist_fill_static(const gchar *name)
{
struct index_entry *ent = INDEX_ENTRY(db_get(&playlist_db, name));
__playlist_fill(name, ent ? &ent->ie_set : NULL);
}
static void __playlist_fill_dynamic(const gchar *name)
{
struct db_entry *track, *next;
unsigned int count = 0, average = 0;
struct set set;
if (string_compare(name, "Most Played") == 0 ||
string_compare(name, "Least Played") == 0)
average = __playlist_find_average();
set_init(&set);
db_for_each(track, next, track_db_get()) {
count = TRACK(track)->tr_count;
if (string_compare(name, "Unplayed") == 0 && count == 0)
set_insert(&set, track->dbe_index);
else if (string_compare(name, "Most Played") == 0 &&
count > average)
set_insert(&set, track->dbe_index);
else if (string_compare(name, "Least Played") == 0 &&
count < average && count > 0)
set_insert(&set, track->dbe_index);
}
__playlist_fill(name, &set);
set_deinit(&set);
}
void playlist_init(struct queue_ops *ops)
{
@ -132,7 +128,7 @@ void playlist_deinit()
void playlist_add(const gchar *name, struct track *track)
{
if (!track || !name || !__playlist_is_static(name))
if (!track || !__playlist_is_static(name))
return;
if (!playlist_has(name, track)) {
@ -167,18 +163,10 @@ bool playlist_has(const gchar *name, struct track *track)
void playlist_select(const gchar *name)
{
struct index_entry *ent;
if (!name)
return;
if (__playlist_is_static(name)) {
ent = INDEX_ENTRY(db_get(&playlist_db, name));
__playlist_fill(name, ent ? &ent->ie_set : NULL);
} else if (__playlist_is_dynamic(name)) {
playlist_q.dynamic_fill(name);
cur_plist = name;
}
if (__playlist_is_static(name))
__playlist_fill_static(name);
else if (__playlist_is_dynamic(name))
__playlist_fill_dynamic(name);
}
index_entry *playlist :: get_tracks(const std::string &name)