From 9522da88d0074e5bb67fdb2f2b753aba1b6487c8 Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Mon, 28 Sep 2015 08:22:51 -0400 Subject: [PATCH] core/tags/genre: Move genre_find() out of the tags namespace Signed-off-by: Anna Schumaker --- core/library.cpp | 2 +- core/tags/genre.cpp | 2 +- include/core/tags/genre.h | 13 +++---------- tests/core/tags/genre.cpp | 4 ++-- tests/core/tags/track.cpp | 2 +- 5 files changed, 8 insertions(+), 15 deletions(-) diff --git a/core/library.cpp b/core/library.cpp index 88b4785e..2ac0582e 100644 --- a/core/library.cpp +++ b/core/library.cpp @@ -98,7 +98,7 @@ static void tag_track(Library *library, const std::string &filepath) track = tags :: add_track( album_find(tag->album().stripWhiteSpace().to8Bit(true), tag->year()), artist_find(tag->artist().stripWhiteSpace().to8Bit(true)), - tags :: get_genre(tag->genre().stripWhiteSpace().to8Bit(true)), + genre_find(tag->genre().stripWhiteSpace().to8Bit(true)), library, filepath, tag->title().stripWhiteSpace().to8Bit(true), audio->length(), tag->track() diff --git a/core/tags/genre.cpp b/core/tags/genre.cpp index 4aa26673..d73a84b1 100644 --- a/core/tags/genre.cpp +++ b/core/tags/genre.cpp @@ -21,7 +21,7 @@ void tags :: init_genre_db() db_load(&genre_db); } -struct genre *tags :: get_genre(const std::string &name) +struct genre *genre_find(const std::string &name) { return db_find(&genre_db, name.c_str()); } diff --git a/include/core/tags/genre.h b/include/core/tags/genre.h index 98ae1a60..1e2cda4b 100644 --- a/include/core/tags/genre.h +++ b/include/core/tags/genre.h @@ -28,19 +28,12 @@ namespace tags /** Called to read the genre_db from disk. */ void init_genre_db(); - /** - * Called to look up a Genre tag by name. If no existing - * tag is found a new one will be created and returned to - * the caller. - * - * @param name The name of the genre. - * @return A matching Genre tag. - */ - struct genre *get_genre(const std::string &); - } +/* Called to find a genre tag by name. */ +struct genre *genre_find(const std::string &); + /* Called to get a genre tag with a specific index. */ struct genre *genre_get(const unsigned int); diff --git a/tests/core/tags/genre.cpp b/tests/core/tags/genre.cpp index 2bfaef89..6ce767bf 100644 --- a/tests/core/tags/genre.cpp +++ b/tests/core/tags/genre.cpp @@ -67,11 +67,11 @@ static void test_genere_db() struct genre *genre; tags :: init_genre_db(); - genre = tags :: get_genre("Video Game Music"); + genre = genre_find("Video Game Music"); test_verify_vg(genre); - test_equal(tags :: get_genre("Video Game Music"), genre); + test_equal(genre_find("Video Game Music"), genre); test_equal(genre_get(0), genre); test_equal(genre_get(1), (struct genre *)NULL); diff --git a/tests/core/tags/track.cpp b/tests/core/tags/track.cpp index b5fdb206..02ee4f72 100644 --- a/tests/core/tags/track.cpp +++ b/tests/core/tags/track.cpp @@ -67,7 +67,7 @@ static void test_track_tag_constructor() tags :: init(); album = album_find("Hyrule Symphony", 1998); artist = artist_find("Koji Kondo"); - genre = tags :: get_genre("Video Game Music"); + genre = genre_find("Video Game Music"); library = tags :: get_library(MUSIC_DIR); Track a(album, artist, genre, library,