From c611eb306da5be7b3c7603890211243c28d43588 Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Mon, 28 Sep 2015 08:25:15 -0400 Subject: [PATCH] core/tags/genre: Move genre_get() out of the tags namespace Signed-off-by: Anna Schumaker --- core/tags/genre.cpp | 2 +- core/tags/track.cpp | 2 +- include/core/tags/genre.h | 12 ++++-------- tests/core/tags/genre.cpp | 4 ++-- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/core/tags/genre.cpp b/core/tags/genre.cpp index 48b9a919..4aa26673 100644 --- a/core/tags/genre.cpp +++ b/core/tags/genre.cpp @@ -26,7 +26,7 @@ struct genre *tags :: get_genre(const std::string &name) return db_find(&genre_db, name.c_str()); } -struct genre *tags :: get_genre(const unsigned int index) +struct genre *genre_get(const unsigned int index) { return db_at(&genre_db, index); } diff --git a/core/tags/track.cpp b/core/tags/track.cpp index dd5e2fca..0e552ae1 100644 --- a/core/tags/track.cpp +++ b/core/tags/track.cpp @@ -123,7 +123,7 @@ void Track :: read(file &file) _library = tags :: get_library(library_id); _artist = artist_get(artist_id); _album = album_get(album_id); - _genre = tags :: get_genre(genre_id); + _genre = genre_get(genre_id); filter :: add(name(), index()); filter :: add(_artist->ar_name, index()); diff --git a/include/core/tags/genre.h b/include/core/tags/genre.h index 76b109ff..98ae1a60 100644 --- a/include/core/tags/genre.h +++ b/include/core/tags/genre.h @@ -38,14 +38,10 @@ namespace tags */ struct genre *get_genre(const std::string &); - /** - * Called to look up a Genre tag by tag index. - * - * @param index The index of the Genre tag. - * @return A matching Genre tag or NULL. - */ - struct genre *get_genre(const unsigned int); - } + +/* Called to get a genre tag with a specific index. */ +struct genre *genre_get(const unsigned int); + #endif /* OCARINA_CORE_TAGS_GENRE_H */ diff --git a/tests/core/tags/genre.cpp b/tests/core/tags/genre.cpp index 67db88f0..2bfaef89 100644 --- a/tests/core/tags/genre.cpp +++ b/tests/core/tags/genre.cpp @@ -72,8 +72,8 @@ static void test_genere_db() test_verify_vg(genre); test_equal(tags :: get_genre("Video Game Music"), genre); - test_equal(tags :: get_genre(0), genre); - test_equal(tags :: get_genre(1), (struct genre *)NULL); + test_equal(genre_get(0), genre); + test_equal(genre_get(1), (struct genre *)NULL); db_init(&genre_db, "genre.db", false); db_load(&genre_db);