From 768f86e802091cb77f9307be814d702c66ac63bf Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna@OcarinaProject.net>
Date: Mon, 28 Sep 2015 09:45:50 -0400
Subject: [PATCH] core/tags/library: Move library_db_init() out of the tags
 namespace

And add the function library_db_deinit().

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
---
 core/tags/library.cpp       |  7 ++++++-
 core/tags/tags.cpp          |  2 +-
 include/core/tags/library.h | 10 +++++++---
 tests/core/tags/library.cpp |  3 ++-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/core/tags/library.cpp b/core/tags/library.cpp
index b3d41416..8627227f 100644
--- a/core/tags/library.cpp
+++ b/core/tags/library.cpp
@@ -67,12 +67,17 @@ void library :: dec_size()
 }
 
 
-void tags :: init_library_db()
+void library_db_init()
 {
 	db_init(&library_db, "library.db", true);
 	db_load(&library_db);
 }
 
+void library_db_deinit()
+{
+	db_deinit(&library_db);
+}
+
 struct library *library_find(const std::string &path)
 {
 	return db_find(&library_db, path.c_str());
diff --git a/core/tags/tags.cpp b/core/tags/tags.cpp
index ba6d7a2c..3b47ca18 100644
--- a/core/tags/tags.cpp
+++ b/core/tags/tags.cpp
@@ -13,6 +13,6 @@ void tags :: init()
 	album_db_init();
 	artist_db_init();
 	genre_db_init();
-	tags :: init_library_db();
+	library_db_init();
 	tags :: init_track_db();
 }
diff --git a/include/core/tags/library.h b/include/core/tags/library.h
index f061120d..c51fb86a 100644
--- a/include/core/tags/library.h
+++ b/include/core/tags/library.h
@@ -89,9 +89,6 @@ struct library : public DatabaseEntry {
 namespace tags
 {
 
-	/** Called to read the library_db from disk. */
-	void init_library_db();
-
 	/**
 	 * Called to find the number of rows in the library_db,
 	 * including NULL rows.
@@ -99,9 +96,16 @@ namespace tags
 	 * @return The Database::actual_size() of the library_db.
 	 */
 	unsigned int library_size();
+
 }
 
 
+/* Called to initialize the library database. */
+void library_db_init();
+
+/* Called to clean up the library database. */
+void library_db_deinit();
+
 /* Called to find a library tag by library path. */
 struct library *library_find(const std::string &);
 
diff --git a/tests/core/tags/library.cpp b/tests/core/tags/library.cpp
index 30f31d27..25d50b00 100644
--- a/tests/core/tags/library.cpp
+++ b/tests/core/tags/library.cpp
@@ -73,7 +73,7 @@ static void test_library_db()
 
 	test_equal(tags :: library_size(), 0);
 
-	tags :: init_library_db();
+	library_db_init();
 	library = library_find("/home/Zelda/Music");
 	test_verify_zelda(library);
 
@@ -95,6 +95,7 @@ static void test_library_db()
 	test_equal(library_get(0), (struct library *)NULL);
 	test_equal(tags :: library_size(), 1);
 
+	library_db_deinit();
 	db_deinit(&library_db);
 	db_load(&library_db);
 	test_equal(library_db.db_size, 0);