Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop

Conflicts:
	CMakeLists.txt
	gui/MainWindow.cpp

1 files changed, 46 insertions, 0 deletions

diff --git a/mmc_updater/src/Log.h b/mmc_updater/src/Log.h
new file mode 100644
index 00000000..cf6be832
--- /dev/null
+++ b/mmc_updater/src/Log.h
@@ -0,0 +1,46 @@
+#pragma once
+
+#include <string>
+#include <fstream>
+
+#include <thread>
+#include <mutex>
+
+class Log
+{
+	public:
+		enum Type
+		{
+			Info,
+			Warn,
+			Error
+		};
+
+		Log();
+		~Log();
+
+		void open(const std::string& path);
+
+		/** Write @p text to the log.  This method is thread-safe. */
+		void write(Type type, const std::string& text);
+		/** Write @p text to the log.  This method is thread-safe. */
+		void write(Type type, const char* text);
+
+		static Log* instance();
+	
+	private:
+		static void writeToStream(std::ostream& stream, Type type, const char* text);
+
+		std::mutex m_mutex;
+		std::ofstream m_output;
+};
+
+inline void Log::write(Type type, const std::string& text)
+{
+	write(type,text.c_str());
+}
+
+#define LOG(type,text) \
+  Log::instance()->write(Log::type,text)
+
+