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

core/tags/genre: Move genre_db_init() out of the tags namespace 

And add the function genre_db_deinit().

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker 2015-09-28 08:18:39 -04:00
parent 9522da88d0
commit 8aa05ecedc
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/tags/genre.cpp
View File

@ -14,13 +14,17 @@ genre :: genre(const std::string &name)
{ {
} }
void genre_db_init()
void tags :: init_genre_db()
{ {
db_init(&genre_db, "genre.db", true); db_init(&genre_db, "genre.db", true);
db_load(&genre_db); db_load(&genre_db);
} }
void genre_db_deinit()
{
db_deinit(&genre_db);
}
struct genre *genre_find(const std::string &name) struct genre *genre_find(const std::string &name)
{ {
return db_find(&genre_db, name.c_str()); return db_find(&genre_db, name.c_str());

2
core/tags/tags.cpp
View File

@ -12,7 +12,7 @@ void tags :: init()
{ {
album_db_init(); album_db_init();
artist_db_init(); artist_db_init();
tags :: init_genre_db(); genre_db_init();
tags :: init_library_db(); tags :: init_library_db();
tags :: init_track_db(); tags :: init_track_db();
} }

10
include/core/tags/genre.h
View File

@ -22,14 +22,12 @@ public:
genre(const std::string &); genre(const std::string &);
}; };
namespace tags
{
/** Called to read the genre_db from disk. */ /* Called to initialize the genre database. */
void init_genre_db(); void genre_db_init();
}
/* Called to clean up the genre database. */
void genre_db_deinit();
/* Called to find a genre tag by name. */ /* Called to find a genre tag by name. */
struct genre *genre_find(const std::string &); struct genre *genre_find(const std::string &);

3
tests/core/tags/genre.cpp
View File

@ -66,7 +66,7 @@ static void test_genere_db()
database<struct genre> genre_db; database<struct genre> genre_db;
struct genre *genre; struct genre *genre;
tags :: init_genre_db(); genre_db_init();
genre = genre_find("Video Game Music"); genre = genre_find("Video Game Music");
test_verify_vg(genre); test_verify_vg(genre);
@ -80,6 +80,7 @@ static void test_genere_db()
test_equal(genre_db.db_size, 1); test_equal(genre_db.db_size, 1);
db_deinit(&genre_db); db_deinit(&genre_db);
genre_db_deinit();
} }
DECLARE_UNIT_TESTS( DECLARE_UNIT_TESTS(