Merge branch 'master' into cache_range

Conflicts:
	music.cpp

1 files changed, 27 insertions, 0 deletions

diff --git a/database.h b/database.h
new file mode 100644
index 0000000..a6ec5ad
--- /dev/null
+++ b/database.h
@@ -0,0 +1,27 @@
+#ifndef DATABASE_H
+#define DATABASE_H
+
+#include "music.h"
+#include "tag.h"
+
+#include <soci/soci.h>
+#include <boost/filesystem.hpp>
+
+#include <vector>
+#include <map>
+#include <string>
+
+class Database {
+	private:
+		soci::session sql;
+	
+	public:
+		Database();
+		virtual ~Database();
+
+		std::vector<MusicListing::p> find(std::map<std::string, std::string> search);
+		std::vector<MusicListing::p> find(std::string search);
+		void update(fs::path track, Tag::p tag);
+};
+
+#endif