Merge branch 'master' into cache_range

Conflicts:
	music.cpp

1 files changed, 5 insertions, 2 deletions

diff --git a/music.h b/music.h
index f7d06bd..17f99f2 100644
--- a/music.h
+++ b/music.h
@@ -25,6 +25,9 @@ class MusicTrack : public MusicListing {
 		virtual void render(HTTP::Connection::p req);
 };
 
+// Forward declaration for MusicDirectory::update()
+class Database;
+
 //! Represents a directory.
 class MusicDirectory : public MusicListing {
 	public:
@@ -35,6 +38,7 @@ class MusicDirectory : public MusicListing {
 
 		MusicDirectory(const fs::path root);
 		virtual void render(HTTP::Connection::p req);
+		void update(Database& db);
 };
 
 namespace music {
@@ -43,10 +47,9 @@ namespace music {
 	MusicListing::p get(const HTTP::Connection::PathList& path);
 	MusicListing::p get(const std::string& path);
 	MusicDirectory::p get_directory(const std::string& path);
-	std::vector<MusicListing::p> find(const std::map<std::string, std::string> search);
+	std::vector<MusicListing::p> find(std::map<std::string, std::string> search);
 	std::vector<MusicListing::p> find(std::string search);
 	void begin_update(const std::string path);
-	void update(const MusicDirectory& dir);
 };
 
 #endif