Merge branch 'master' into cache_range

Conflicts:
	music.cpp

1 files changed, 26 insertions, 0 deletions

diff --git a/cache.h b/cache.h
new file mode 100644
index 0000000..21d4a52
--- /dev/null
+++ b/cache.h
@@ -0,0 +1,26 @@
+#ifndef CACHE_H
+#define CACHE_H
+
+#include "decoder.h"
+#include "encoder.h"
+
+#include <boost/filesystem.hpp>
+
+namespace fs = boost::filesystem;
+
+class EncodedCache {
+	private:
+		Decoder::p decoder;
+		Encoder::p encoder;
+
+		std::string hash;
+
+	public:
+		EncodedCache(fs::path path, Decoder::p decoder, Encoder::p encoder);
+		virtual ~EncodedCache() {};
+
+		fs::path get_path();
+		void create_cache();
+};
+
+#endif