core/collection: Move collection_get_queue() out of the collection
namespace Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
parent
89ce6d725c
commit
295a4424ed
|
@ -67,7 +67,7 @@ void AudioDriver :: eos()
|
||||||
{
|
{
|
||||||
if (cur_track) {
|
if (cur_track) {
|
||||||
track_played(cur_track);
|
track_played(cur_track);
|
||||||
queue_updated(collection :: get_queue(), cur_track);
|
queue_updated(collection_get_queue(), cur_track);
|
||||||
}
|
}
|
||||||
|
|
||||||
_load_track(deck :: next(), continue_playback());
|
_load_track(deck :: next(), continue_playback());
|
||||||
|
|
|
@ -64,7 +64,7 @@ static void upgrade_v0()
|
||||||
{
|
{
|
||||||
int random, ascending;
|
int random, ascending;
|
||||||
unsigned int num, field;
|
unsigned int num, field;
|
||||||
queue *library = collection :: get_queue();
|
queue *library = collection_get_queue();
|
||||||
|
|
||||||
file_readf(&deck_file, "%d %u", &random, &num);
|
file_readf(&deck_file, "%d %u", &random, &num);
|
||||||
if (random)
|
if (random)
|
||||||
|
@ -216,7 +216,7 @@ struct track *deck :: next()
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!track)
|
if (!track)
|
||||||
track = queue_next(collection :: get_queue());
|
track = queue_next(collection_get_queue());
|
||||||
if (track) {
|
if (track) {
|
||||||
queue_remove_all(&recent_queue, track);
|
queue_remove_all(&recent_queue, track);
|
||||||
queue_add(&recent_queue, track);
|
queue_add(&recent_queue, track);
|
||||||
|
|
|
@ -243,7 +243,7 @@ void collection_set_enabled(struct library *library, bool enabled)
|
||||||
queue_resort(&library_q);
|
queue_resort(&library_q);
|
||||||
}
|
}
|
||||||
|
|
||||||
queue *collection :: get_queue()
|
struct queue *collection_get_queue()
|
||||||
{
|
{
|
||||||
return &library_q;
|
return &library_q;
|
||||||
}
|
}
|
||||||
|
|
|
@ -96,7 +96,7 @@ void playlist :: init(struct queue_ops *ops)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
set_for_each(&ent->ie_set, &it)
|
set_for_each(&ent->ie_set, &it)
|
||||||
queue_remove_all(collection :: get_queue(),
|
queue_remove_all(collection_get_queue(),
|
||||||
track_get(it.it_val));
|
track_get(it.it_val));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -117,7 +117,7 @@ void playlist :: add(struct track *track, const std::string &name)
|
||||||
if (cur_plist == name)
|
if (cur_plist == name)
|
||||||
queue_add(&playlist_q, track);
|
queue_add(&playlist_q, track);
|
||||||
if (name == "Banned")
|
if (name == "Banned")
|
||||||
queue_remove_all(collection :: get_queue(), track);
|
queue_remove_all(collection_get_queue(), track);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -127,7 +127,7 @@ void playlist :: del(struct track *track, const std::string &name)
|
||||||
if (cur_plist == name)
|
if (cur_plist == name)
|
||||||
queue_remove_all(&playlist_q, track);
|
queue_remove_all(&playlist_q, track);
|
||||||
if (name == "Banned")
|
if (name == "Banned")
|
||||||
queue_add(collection :: get_queue(), track);
|
queue_add(collection_get_queue(), track);
|
||||||
}
|
}
|
||||||
|
|
||||||
void playlist :: select(const std::string &name)
|
void playlist :: select(const std::string &name)
|
||||||
|
|
|
@ -12,7 +12,7 @@ private:
|
||||||
CollectionLabel *collection_label;
|
CollectionLabel *collection_label;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
CollectionTab() : Tab(collection :: get_queue())
|
CollectionTab() : Tab(collection_get_queue())
|
||||||
{
|
{
|
||||||
tab_builder->add_from_file(gui :: share_file("QueueLabel.ui"));
|
tab_builder->add_from_file(gui :: share_file("QueueLabel.ui"));
|
||||||
tab_builder->get_widget_derived("CollectionLabel", collection_label);
|
tab_builder->get_widget_derived("CollectionLabel", collection_label);
|
||||||
|
|
|
@ -98,7 +98,7 @@ static void remove_banned_tracks()
|
||||||
return;
|
return;
|
||||||
|
|
||||||
set_for_each(&ent->ie_set, &it)
|
set_for_each(&ent->ie_set, &it)
|
||||||
queue_remove_all(collection :: get_queue(), track_get(it.it_val));
|
queue_remove_all(collection_get_queue(), track_get(it.it_val));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -26,13 +26,6 @@ namespace collection
|
||||||
|
|
||||||
void save(struct queue *, enum queue_flags);
|
void save(struct queue *, enum queue_flags);
|
||||||
|
|
||||||
/**
|
|
||||||
* Use to access the library queue.
|
|
||||||
*
|
|
||||||
* @return The queue of tracks currently in the library.
|
|
||||||
*/
|
|
||||||
queue *get_queue();
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -59,4 +52,7 @@ void collection_update_all();
|
||||||
/* Called to enable or disable a library directory. */
|
/* Called to enable or disable a library directory. */
|
||||||
void collection_set_enabled(struct library *, bool);
|
void collection_set_enabled(struct library *, bool);
|
||||||
|
|
||||||
|
/* Called to access the collection queue. */
|
||||||
|
struct queue *collection_get_queue();
|
||||||
|
|
||||||
#endif /* OCARINA_CORE_LIBRARY_H */
|
#endif /* OCARINA_CORE_LIBRARY_H */
|
||||||
|
|
|
@ -126,7 +126,7 @@ void test_track_controls()
|
||||||
struct track *track = NULL;
|
struct track *track = NULL;
|
||||||
|
|
||||||
TestDriver *driver = (TestDriver *)audio :: get_driver();
|
TestDriver *driver = (TestDriver *)audio :: get_driver();
|
||||||
queue_unset_flag(collection :: get_queue(), Q_RANDOM);
|
queue_unset_flag(collection_get_queue(), Q_RANDOM);
|
||||||
|
|
||||||
audio :: pause();
|
audio :: pause();
|
||||||
audio :: next();
|
audio :: next();
|
||||||
|
|
|
@ -26,7 +26,7 @@ static void test_init()
|
||||||
collection_init(NULL);
|
collection_init(NULL);
|
||||||
deck :: init(NULL, NULL);
|
deck :: init(NULL, NULL);
|
||||||
|
|
||||||
test_equal(queue_has_flag(collection :: get_queue(), Q_RANDOM), true);
|
test_equal(queue_has_flag(collection_get_queue(), Q_RANDOM), true);
|
||||||
test_equal(deck :: get_queues().size(), (size_t)2);
|
test_equal(deck :: get_queues().size(), (size_t)2);
|
||||||
|
|
||||||
it = deck :: get_queues().begin();
|
it = deck :: get_queues().begin();
|
||||||
|
@ -134,7 +134,7 @@ static void test_next_prev()
|
||||||
test_equal(deck :: index(q1), (unsigned)0);
|
test_equal(deck :: index(q1), (unsigned)0);
|
||||||
|
|
||||||
queue_unset_flag(q1, Q_ENABLED);
|
queue_unset_flag(q1, Q_ENABLED);
|
||||||
queue_unset_flag(collection :: get_queue(), Q_RANDOM);
|
queue_unset_flag(collection_get_queue(), Q_RANDOM);
|
||||||
|
|
||||||
test_equal(queue_size(q1), (unsigned)5);
|
test_equal(queue_size(q1), (unsigned)5);
|
||||||
deck :: next();
|
deck :: next();
|
||||||
|
|
|
@ -11,7 +11,7 @@ extern "C" {
|
||||||
|
|
||||||
static void test_init()
|
static void test_init()
|
||||||
{
|
{
|
||||||
struct queue *q = collection :: get_queue();
|
struct queue *q = collection_get_queue();
|
||||||
GSList *list;
|
GSList *list;
|
||||||
|
|
||||||
filter_init();
|
filter_init();
|
||||||
|
@ -37,7 +37,7 @@ static void test_init()
|
||||||
|
|
||||||
static void test_add()
|
static void test_add()
|
||||||
{
|
{
|
||||||
struct queue *q = collection :: get_queue();
|
struct queue *q = collection_get_queue();
|
||||||
struct library *lib;
|
struct library *lib;
|
||||||
|
|
||||||
test_equal(collection_add("tests/Invalid"), NULL);
|
test_equal(collection_add("tests/Invalid"), NULL);
|
||||||
|
@ -61,7 +61,7 @@ static void test_add()
|
||||||
|
|
||||||
static void test_update()
|
static void test_update()
|
||||||
{
|
{
|
||||||
struct queue *q = collection :: get_queue();
|
struct queue *q = collection_get_queue();
|
||||||
struct library *lib = library_get(0);
|
struct library *lib = library_get(0);
|
||||||
|
|
||||||
g_rename("tests/Music/Hyrule Symphony/", "tests/Music/symphony/");
|
g_rename("tests/Music/Hyrule Symphony/", "tests/Music/symphony/");
|
||||||
|
@ -114,7 +114,7 @@ static void test_update()
|
||||||
|
|
||||||
static void test_enable()
|
static void test_enable()
|
||||||
{
|
{
|
||||||
struct queue *q = collection :: get_queue();
|
struct queue *q = collection_get_queue();
|
||||||
struct library *lib = library_get(0);
|
struct library *lib = library_get(0);
|
||||||
|
|
||||||
collection_set_enabled(NULL, true);
|
collection_set_enabled(NULL, true);
|
||||||
|
@ -135,7 +135,7 @@ static void test_enable()
|
||||||
|
|
||||||
static void test_remove()
|
static void test_remove()
|
||||||
{
|
{
|
||||||
struct queue *q = collection :: get_queue();
|
struct queue *q = collection_get_queue();
|
||||||
|
|
||||||
collection_remove(NULL);
|
collection_remove(NULL);
|
||||||
test_equal(track_db_get()->db_size, 48);
|
test_equal(track_db_get()->db_size, 48);
|
||||||
|
@ -148,7 +148,7 @@ static void test_remove()
|
||||||
|
|
||||||
static void test_deinit()
|
static void test_deinit()
|
||||||
{
|
{
|
||||||
struct queue *q = collection :: get_queue();
|
struct queue *q = collection_get_queue();
|
||||||
|
|
||||||
collection_deinit();
|
collection_deinit();
|
||||||
tags_deinit();
|
tags_deinit();
|
||||||
|
|
|
@ -30,7 +30,7 @@ static void test_init()
|
||||||
|
|
||||||
ent = playlist :: get_tracks("Banned");
|
ent = playlist :: get_tracks("Banned");
|
||||||
test_equal(set_size(&ent->ie_set), (size_t)4);
|
test_equal(set_size(&ent->ie_set), (size_t)4);
|
||||||
test_equal(queue_size(collection :: get_queue()), (unsigned)20);
|
test_equal(queue_size(collection_get_queue()), (unsigned)20);
|
||||||
ent = playlist :: get_tracks("Favorites");
|
ent = playlist :: get_tracks("Favorites");
|
||||||
test_equal(set_size(&ent->ie_set), (size_t)8);
|
test_equal(set_size(&ent->ie_set), (size_t)8);
|
||||||
ent = playlist :: get_tracks("No Such Playlist");
|
ent = playlist :: get_tracks("No Such Playlist");
|
||||||
|
@ -61,7 +61,7 @@ static void test_add()
|
||||||
{
|
{
|
||||||
index_entry *ent;
|
index_entry *ent;
|
||||||
queue *q = playlist :: get_queue();
|
queue *q = playlist :: get_queue();
|
||||||
queue *l = collection :: get_queue();
|
queue *l = collection_get_queue();
|
||||||
|
|
||||||
playlist :: select("Favorites");
|
playlist :: select("Favorites");
|
||||||
|
|
||||||
|
@ -85,7 +85,7 @@ static void test_delete()
|
||||||
{
|
{
|
||||||
index_entry *ent;
|
index_entry *ent;
|
||||||
queue *q = playlist :: get_queue();
|
queue *q = playlist :: get_queue();
|
||||||
queue *l = collection :: get_queue();
|
queue *l = collection_get_queue();
|
||||||
|
|
||||||
playlist :: del(track_get(5), "Banned");
|
playlist :: del(track_get(5), "Banned");
|
||||||
ent = playlist :: get_tracks("Banned");
|
ent = playlist :: get_tracks("Banned");
|
||||||
|
|
Loading…
Reference in New Issue