From 8aa05ecedce27ddec90a91c8428ba6cbc0f6d435 Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna@OcarinaProject.net>
Date: Mon, 28 Sep 2015 08:18:39 -0400
Subject: [PATCH] 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>
---
 core/tags/genre.cpp       |  8 ++++++--
 core/tags/tags.cpp        |  2 +-
 include/core/tags/genre.h | 10 ++++------
 tests/core/tags/genre.cpp |  3 ++-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/core/tags/genre.cpp b/core/tags/genre.cpp
index d73a84b1..f2bd7b73 100644
--- a/core/tags/genre.cpp
+++ b/core/tags/genre.cpp
@@ -14,13 +14,17 @@ genre :: genre(const std::string &name)
 {
 }
 
-
-void tags :: init_genre_db()
+void genre_db_init()
 {
 	db_init(&genre_db, "genre.db", true);
 	db_load(&genre_db);
 }
 
+void genre_db_deinit()
+{
+	db_deinit(&genre_db);
+}
+
 struct genre *genre_find(const std::string &name)
 {
 	return db_find(&genre_db, name.c_str());
diff --git a/core/tags/tags.cpp b/core/tags/tags.cpp
index 4ee81e36..ba6d7a2c 100644
--- a/core/tags/tags.cpp
+++ b/core/tags/tags.cpp
@@ -12,7 +12,7 @@ void tags :: init()
 {
 	album_db_init();
 	artist_db_init();
-	tags :: init_genre_db();
+	genre_db_init();
 	tags :: init_library_db();
 	tags :: init_track_db();
 }
diff --git a/include/core/tags/genre.h b/include/core/tags/genre.h
index 1e2cda4b..7ba877db 100644
--- a/include/core/tags/genre.h
+++ b/include/core/tags/genre.h
@@ -22,14 +22,12 @@ public:
 	genre(const std::string &);
 };
 
-namespace tags
-{
 
-	/** Called to read the genre_db from disk. */
-	void init_genre_db();
-
-}
+/* Called to initialize the genre database. */
+void genre_db_init();
 
+/* Called to clean up the genre database. */
+void genre_db_deinit();
 
 /* Called to find a genre tag by name. */
 struct genre *genre_find(const std::string &);
diff --git a/tests/core/tags/genre.cpp b/tests/core/tags/genre.cpp
index 6ce767bf..6adc16de 100644
--- a/tests/core/tags/genre.cpp
+++ b/tests/core/tags/genre.cpp
@@ -66,7 +66,7 @@ static void test_genere_db()
 	database<struct genre> genre_db;
 	struct genre *genre;
 
-	tags :: init_genre_db();
+	genre_db_init();
 	genre = genre_find("Video Game Music");
 
 	test_verify_vg(genre);
@@ -80,6 +80,7 @@ static void test_genere_db()
 	test_equal(genre_db.db_size, 1);
 
 	db_deinit(&genre_db);
+	genre_db_deinit();
 }
 
 DECLARE_UNIT_TESTS(