From bae6f653d107d23b9e59070238cf8d1bed5eb24f Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 4 Feb 2014 19:17:22 +0100
Subject: Instance: merge DatabaseModified() into OnDatabaseModified()

---
 src/Instance.cxx | 18 +++++++-----------
 src/Instance.hxx |  7 -------
 2 files changed, 7 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/Instance.cxx b/src/Instance.cxx
index 42d62ac7c..db81a2542 100644
--- a/src/Instance.cxx
+++ b/src/Instance.cxx
@@ -40,16 +40,6 @@ Instance::DeleteSong(const char *uri)
 	partition->DeleteSong(uri);
 }
 
-void
-Instance::DatabaseModified()
-{
-	assert(database != nullptr);
-
-	stats_invalidate();
-	partition->DatabaseModified(*database);
-	idle_add(IDLE_DATABASE);
-}
-
 #endif
 
 void
@@ -69,7 +59,13 @@ Instance::SyncWithPlayer()
 void
 Instance::OnDatabaseModified()
 {
-	DatabaseModified();
+	assert(database != nullptr);
+
+	/* propagate the change to all subsystems */
+
+	stats_invalidate();
+	partition->DatabaseModified(*database);
+	idle_add(IDLE_DATABASE);
 }
 
 #endif
diff --git a/src/Instance.hxx b/src/Instance.hxx
index 9e3f92458..7d517e245 100644
--- a/src/Instance.hxx
+++ b/src/Instance.hxx
@@ -81,13 +81,6 @@ struct Instance final
 	Database *GetDatabase(Error &error);
 
 	void DeleteSong(const char *uri);
-
-	/**
-	 * The database has been modified.  Propagate the change to
-	 * all subsystems.
-	 */
-	void DatabaseModified();
-
 #endif
 
 	/**
-- 
cgit v1.2.3