X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Flog.h;h=f83c6a90204ef675c93a89f7b0100f760c7efe01;hb=05c37bfdb86be26497d5baa448a0cbda20e33bed;hp=3ad6516c11b7b56ee270c269967bd3d59177e464;hpb=147cca5876dfbdf56e21289c3a36bec4b4850191;p=dcpomatic.git

diff --git a/src/lib/log.h b/src/lib/log.h
index 3ad6516c1..f83c6a902 100644
--- a/src/lib/log.h
+++ b/src/lib/log.h
@@ -24,50 +24,71 @@
  *  @brief A very simple logging class.
  */
 
-#include <string>
+#include <dcp/types.h>
 #include <boost/thread/mutex.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/signals2.hpp>
+#include <string>
 
 /** @class Log
  *  @brief A very simple logging class.
  */
-class Log
+class Log : public boost::noncopyable
 {
 public:
 	Log ();
 	virtual ~Log () {}
 
-	enum Level {
-		STANDARD = 0,
-		VERBOSE = 1,
-		TIMING = 2
-	};
+	static const int TYPE_GENERAL;
+	static const int TYPE_WARNING;
+	static const int TYPE_ERROR;
+	static const int TYPE_DEBUG;
+	static const int TYPE_TIMING;
+
+	void log (std::string message, int type);
+	void microsecond_log (std::string message, int type);
+	void dcp_log (dcp::NoteType type, std::string message);
 
-	void log (std::string m, Level l = STANDARD);
-	void microsecond_log (std::string m, Level l = STANDARD);
+	void set_types (int types);
 
-	void set_level (Level l);
-	void set_level (std::string l);
+	virtual std::string head_and_tail (int amount = 1024) const = 0;
 
-protected:	
+protected:
+	
 	/** mutex to protect the log */
-	boost::mutex _mutex;
+	mutable boost::mutex _mutex;
 	
 private:
 	virtual void do_log (std::string m) = 0;
+	void config_changed ();
 	
-	/** level above which to ignore log messages */
-	Level _level;
+	/** bit-field of log types which should be put into the log (others are ignored) */
+	int _types;
+	boost::signals2::scoped_connection _config_connection;
 };
 
 class FileLog : public Log
 {
 public:
-	FileLog (std::string file);
+	FileLog (boost::filesystem::path file);
+
+	std::string head_and_tail (int amount = 1024) const;
 
 private:
 	void do_log (std::string m);
 	/** filename to write to */
-	std::string _file;
+	boost::filesystem::path _file;
+};
+
+class NullLog : public Log
+{
+public:
+	std::string head_and_tail (int) const {
+		return "";
+	}
+
+private:	
+	void do_log (std::string) {}
 };
 
 #endif