From eea0f57cf87b06b9f2850407d32d26c26fe824a9 Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna@OcarinaProject.net>
Date: Mon, 28 Sep 2015 15:39:26 -0400
Subject: [PATCH] core/tags/track: Move track_commit_db() out of tags namespace

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

diff --git a/core/library.cpp b/core/library.cpp
index 45c54722..03bbe7c3 100644
--- a/core/library.cpp
+++ b/core/library.cpp
@@ -137,7 +137,7 @@ static void scan_path(struct scan_info &scan)
 		name = g_dir_read_name(dir);
 	}
 
-	tags :: commit_track_db();
+	track_db_commit();
 }
 
 static void validate_library(struct library *&library)
diff --git a/core/tags/track.cpp b/core/tags/track.cpp
index b15204c9..394a6144 100644
--- a/core/tags/track.cpp
+++ b/core/tags/track.cpp
@@ -100,7 +100,7 @@ void track :: played()
 {
 	tr_count++;
 	date_today(&tr_date);
-	tags :: commit_track_db();
+	track_db_commit();
 }
 
 int track :: compare_date(const struct track *rhs)
@@ -157,6 +157,11 @@ void track_db_deinit()
 	db_deinit(&track_db);
 }
 
+void track_db_commit()
+{
+	db_save(&track_db);
+}
+
 struct track *track_add(struct album *album, struct artist *artist,
 			struct genre *genre, struct library *library,
 			const std::string &filepath, const std::string &name,
@@ -182,7 +187,7 @@ void track_remove_all(struct library *library)
 		if (it->library() == library)
 			db_remove(&track_db, it);
 	}
-	tags :: commit_track_db();
+	track_db_commit();
 }
 
 struct track *track_get(const unsigned int index)
@@ -194,8 +199,3 @@ unsigned int tags :: track_size()
 {
 	return db_actual_size(&track_db);
 }
-
-void tags :: commit_track_db()
-{
-	db_save(&track_db);
-}
diff --git a/include/core/tags/track.h b/include/core/tags/track.h
index d122b882..85a3cb0c 100644
--- a/include/core/tags/track.h
+++ b/include/core/tags/track.h
@@ -124,9 +124,6 @@ namespace tags
 	 * @return The Database::actual_size() of the track_db.
 	 */
 	unsigned int track_size();
-
-	/** Called to write the track_db to disk. */
-	void commit_track_db();
 }
 
 
@@ -136,6 +133,9 @@ void track_db_init();
 /* Called to clean up the track database. */
 void track_db_deinit();
 
+/* Called to commit the track database. */
+void track_db_commit();
+
 /* Called to add a track tag to the database. */
 struct track *track_add(struct album *, struct artist *, struct genre *,
 			struct library *, const std::string &, 
diff --git a/tests/core/tags/track.cpp b/tests/core/tags/track.cpp
index df2e3151..1fc8d95c 100644
--- a/tests/core/tags/track.cpp
+++ b/tests/core/tags/track.cpp
@@ -146,7 +146,7 @@ static void test_track_tag_lookup()
 	test_equal(track_get(a->index() + 2), (struct track *)NULL);
 
 	test_track_tag_load_db(0);
-	tags :: commit_track_db();
+	track_db_commit();
 	test_track_tag_load_db(2);
 
 
@@ -154,7 +154,7 @@ static void test_track_tag_lookup()
 	track_remove(a);
 	test_equal(track_get(index), (struct track *)NULL);
 	test_track_tag_load_db(2);
-	tags :: commit_track_db();
+	track_db_commit();
 	test_track_tag_load_db(1);
 	test_equal(library->li_size, (unsigned)1);
 	test_equal(tags :: track_size(), b->index() + 1);