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

core/tags/track: Move track_get() out of the tags namespace 

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker 2015-09-28 15:54:21 -04:00
parent 765079df94
commit c8061e2868
16 changed files with 45 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/audio.cpp
View File

@ -84,7 +84,7 @@ void audio :: init()
file_open(&f_cur_track, OPEN_READ);
file_readf(&f_cur_track, "%u", &id);
file_close(&f_cur_track);
audio :: load_track(tags :: get_track(id));
audio :: load_track(track_get(id));
}
}

6
core/library.cpp
View File

@ -145,7 +145,7 @@ static void validate_library(struct library *&library)
struct track *track;
for (unsigned int i = 0; i < tags :: track_size(); i++) {
track = tags :: get_track(i);
track = track_get(i);
if (!track || (track->library() != library))
continue;
@ -169,7 +169,7 @@ void collection :: init()
library_q.load();
for (unsigned int i = 0; i < tags :: track_size(); i++) {
track = tags :: get_track(i);
track = track_get(i);
if (track && (track->library()->li_enabled))
library_q.add(track);
}
@ -228,7 +228,7 @@ void collection :: set_enabled(struct library *library, bool enabled)
library_set_enabled(library, enabled);
for (unsigned int i = 0; i < tags :: track_size(); i++) {
track = tags :: get_track(i);
track = track_get(i);
if (track && (track->library() == library)) {
if (enabled)
library_q.add(track);

8
core/playlist.cpp
View File

@ -28,7 +28,7 @@ public:
clear();
set_for_each(&ent->ie_set, &it)
add(tags :: get_track(it.it_val));
add(track_get(it.it_val));
}
unsigned int find_average_count()
@ -37,7 +37,7 @@ public:
unsigned int total = 0, count = 0;
for (unsigned int i = 0; i < tags :: track_size(); i++) {
track = tags :: get_track(i);
track = track_get(i);
if (track != NULL) {
total += track->count();
count++;
@ -69,7 +69,7 @@ public:
clear();
for (unsigned int i = 0; i < tags :: track_size(); i++) {
track = tags :: get_track(i);
track = track_get(i);
if (track != NULL)
dynamic_add(name, track, avg);
}
@ -95,7 +95,7 @@ void playlist :: init()
return;
set_for_each(&ent->ie_set, &it)
collection :: get_queue()->del(tags :: get_track(it.it_val));
collection :: get_queue()->del(track_get(it.it_val));
}
bool playlist :: has(struct track *track, const std::string &name)

2
core/queue.cpp
View File

@ -45,7 +45,7 @@ void Queue :: read(file &file)
_tracks.resize(n);
for (unsigned int i = 0; i < n; i++) {
file_readf(&file, "%u", &id);
_tracks[i] = tags :: get_track(id);
_tracks[i] = track_get(id);
_length += _tracks[i]->length();
}
}

10
core/tags/track.cpp
View File

@ -164,11 +164,6 @@ struct track *tags :: add_track(struct album *album, struct artist *artist,
path, name, length, track));
}
struct track *tags :: get_track(const unsigned int index)
{
return db_at(&track_db, index);
}
void tags :: remove_track(struct track *track)
{
db_remove(&track_db, track);
@ -185,6 +180,11 @@ void tags :: remove_library_tracks(struct library *library)
tags :: commit_track_db();
}
struct track *track_get(const unsigned int index)
{
return db_at(&track_db, index);
}
unsigned int tags :: track_size()
{
return db_actual_size(&track_db);

2
gui/collection.cpp
View File

@ -39,7 +39,7 @@ public:
tab_selected_ids(ids);
for (unsigned int i = 0; i < ids.size(); i++)
playlist :: add(tags :: get_track(ids[i]), "Banned");
playlist :: add(track_get(ids[i]), "Banned");
return true;
}

2
gui/manager.cpp
View File

@ -95,7 +95,7 @@ static void remove_banned_tracks()
return;
set_for_each(&ent->ie_set, &it)
collection :: get_queue()->del(tags :: get_track(it.it_val));
collection :: get_queue()->del(track_get(it.it_val));
}

2
gui/playlist.cpp
View File

@ -115,7 +115,7 @@ public:
tab_selected_ids(ids);
for (unsigned int i = 0; i < ids.size(); i++)
playlist :: del(tags :: get_track(ids[i]), cur);
playlist :: del(track_get(ids[i]), cur);
return true;
}
} *p_tab;

2
gui/queue/model.cpp
View File

@ -49,7 +49,7 @@ void QueueModel::on_row_changed(unsigned int row)
void QueueModel::on_path_selected(const Gtk::TreePath &path)
{
audio :: load_track(tags :: get_track(path_to_id(path)));
audio :: load_track(track_get(path_to_id(path)));
_queue->track_selected(path[0]);
audio :: play();
}

4
gui/tabs.cpp
View File

@ -160,7 +160,7 @@ void Tab :: tab_queue_add(Queue *pq)
tab_selected_ids(ids);
for (unsigned int i = 0; i < ids.size(); i++)
pq->add(tags :: get_track(ids[i]));
pq->add(track_get(ids[i]));
}
bool Tab :: tab_queue_selected(bool random)
@ -190,7 +190,7 @@ bool Tab :: tab_add_to_playlist(const std::string &playlist)
tab_selected_ids(ids);
for (unsigned int i = 0; i < ids.size(); i++)
playlist :: add(tags :: get_track(ids[i]), playlist);
playlist :: add(track_get(ids[i]), playlist);
return true;
}

12
include/core/tags/track.h
View File

@ -138,14 +138,6 @@ namespace tags
struct library *, const std::string &,
const std::string &, unsigned int, unsigned int);
/**
* Called to look up a Track tag by tag index.
*
* @param index The index of the Track tag.
* @return A matching Track tag, or NULL.
*/
struct track *get_track(const unsigned int);
/**
* Called to remove a Track tag from the database.
*
@ -172,4 +164,8 @@ namespace tags
void commit_track_db();
}
/* Called to get a track tag with a specific index. */
struct track *track_get(const unsigned int);
#endif /* OCARINA_CORE_TAGS_TRACK_H */

2
tests/core/audio.cpp
View File

@ -136,7 +136,7 @@ void test_track_controls()
audio :: load_track(track);
test_not_equal(audio :: current_track(), track);
track = tags :: get_track(0);
track = track_get(0);
audio :: seek_to(4242);
audio :: load_track(track);
test_equal(driver->is_playing(), true);

2
tests/core/deck.cpp
View File

@ -116,7 +116,7 @@ static void test_next_prev()
q0->unset_flag(Q_RANDOM);
for (unsigned int i = 0; i < 4; i++)
q0->add(tags :: get_track(i));
q0->add(track_get(i));
test_not_equal(q, Q_NULL);
test_equal(q->size(), (unsigned)0);

18
tests/core/playlist.cpp
View File

@ -66,19 +66,19 @@ static void test_add()
playlist :: select("Favorites");
playlist :: add(tags :: get_track(5), "Banned");
playlist :: add(track_get(5), "Banned");
ent = playlist :: get_tracks("Banned");
test_equal(set_size(&ent->ie_set), (size_t)5);
test_equal(q->size(), (unsigned)8);
test_equal(l->size(), (unsigned)19);
playlist :: add(tags :: get_track(16), "Favorites");
playlist :: add(tags :: get_track(5), "Favorites");
playlist :: add(track_get(16), "Favorites");
playlist :: add(track_get(5), "Favorites");
ent = playlist :: get_tracks("Favorites");
test_equal(set_size(&ent->ie_set), (size_t)9);
test_equal(q->size(), (unsigned)9);
playlist :: add(tags :: get_track(6), "No Playlist");
playlist :: add(track_get(6), "No Playlist");
test_equal(playlist :: get_tracks("No Playlist"), IDX_NULL);
}
@ -88,18 +88,18 @@ static void test_delete()
Queue *q = playlist :: get_queue();
Queue *l = collection :: get_queue();
playlist :: del(tags :: get_track(5), "Banned");
playlist :: del(track_get(5), "Banned");
ent = playlist :: get_tracks("Banned");
test_equal(set_size(&ent->ie_set), (size_t)4);
test_equal(q->size(), (unsigned)9);
test_equal(l->size(), (unsigned)20);
playlist :: del(tags :: get_track(5), "Favorites");
playlist :: del(track_get(5), "Favorites");
ent = playlist :: get_tracks("Favorites");
test_equal(set_size(&ent->ie_set), (size_t)8);
test_equal(q->size(), (unsigned)8);
playlist :: del(tags :: get_track(6), "No Playlist");
playlist :: del(track_get(6), "No Playlist");
test_equal(playlist :: get_tracks("No Playlist"), IDX_NULL);
}
@ -109,13 +109,13 @@ static void test_has()
struct track *track;
for (unsigned int i = 0; i < 24; i++) {
track = tags :: get_track(i);
track = track_get(i);
test_loop_equal(playlist :: has(track, "Banned"),
(i <= 3) ? true : false, i);
} test_loop_passed();
for (unsigned int i = 0; i < 24; i++) {
track = tags :: get_track(i);
track = track_get(i);
test_loop_equal(playlist :: has(track, "Favorites"),
(i >= 16) ? true : false, i);
} test_loop_passed();

12
tests/core/queue.cpp
View File

@ -99,7 +99,7 @@ void test_add_remove()
/* Add tracks */
for (unsigned int i = 0; i < 24; i++) {
track = tags :: get_track(i);
track = track_get(i);
expected += track->length();
test_loop_equal(q.add(track), i, i);
test_loop_equal(count_add, i + 1, i);
@ -110,7 +110,7 @@ void test_add_remove()
/* Add everything again */
for (unsigned int i = 24; i < 48; i++) {
track = tags :: get_track(i - 24);
track = track_get(i - 24);
expected += track->length();
test_loop_equal(q.add(track), i, i);
test_loop_equal(count_add, i + 1, i);
@ -122,7 +122,7 @@ void test_add_remove()
/* Test removing multiple tracks at once */
count_del = 0;
for (unsigned int i = 0; i < 12; i++) {
track = tags :: get_track(i);
track = track_get(i);
q.del(track);
expected -= track->length() * 2;
test_loop_equal(count_del, (i + 1) * 2, i);
@ -156,7 +156,7 @@ void test_add_remove()
static void test_fill_q(TestQueue *q)
{
for (unsigned int i = 0; i < 24; i++)
q->add(tags :: get_track(i));
q->add(track_get(i));
}
void test_updated()
@ -167,12 +167,12 @@ void test_updated()
test_fill_q(&q);
for (unsigned int i = 0; i < 24; i++) {
q.updated(tags :: get_track(i));
q.updated(track_get(i));
test_loop_equal(last_update, i, i);
test_loop_equal(count_updated, i + 1, i);
} test_loop_passed();
track = tags :: get_track(0);
track = track_get(0);
q.add(track);
q.add(track);
q.updated(track);

8
tests/core/tags/track.cpp
View File

@ -141,9 +141,9 @@ static void test_track_tag_lookup()
test_equal(tags :: track_size(), b->index() + 1);
test_equal(tags :: get_track(a->index()), a);
test_equal(tags :: get_track(a->index() + 1), b);
test_equal(tags :: get_track(a->index() + 2), (struct track *)NULL);
test_equal(track_get(a->index()), a);
test_equal(track_get(a->index() + 1), b);
test_equal(track_get(a->index() + 2), (struct track *)NULL);
test_track_tag_load_db(0);
tags :: commit_track_db();
@ -152,7 +152,7 @@ static void test_track_tag_lookup()
index = a->index();
tags :: remove_track(a);
test_equal(tags :: get_track(index), (struct track *)NULL);
test_equal(track_get(index), (struct track *)NULL);
test_track_tag_load_db(2);
tags :: commit_track_db();
test_track_tag_load_db(1);