X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Flog.h;h=3efed667bd003e9eb1f2a15bd05696201b0c821b;hb=bdbe925a467f9b7149322ad8d1c090d4c1e6d5c3;hp=2ba273b44dd09e2e254c3a914ce16d2829959cee;hpb=446427a28a055115d78d5ec513b9229571fca511;p=dcpomatic.git

diff --git a/src/lib/log.h b/src/lib/log.h
index 2ba273b44..3efed667b 100644
--- a/src/lib/log.h
+++ b/src/lib/log.h
@@ -24,9 +24,11 @@
  *  @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.
@@ -40,42 +42,30 @@ public:
 	static const int TYPE_GENERAL;
 	static const int TYPE_WARNING;
 	static const int TYPE_ERROR;
+	static const int TYPE_DEBUG_DECODE;
+	static const int TYPE_DEBUG_ENCODE;
 	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 set_types (int types);
 
-protected:	
+	virtual std::string head_and_tail (int amount = 1024) const = 0;
+
+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 ();
-	
+
 	/** bit-field of log types which should be put into the log (others are ignored) */
 	int _types;
-};
-
-class FileLog : public Log
-{
-public:
-	FileLog (boost::filesystem::path file);
-
-private:
-	void do_log (std::string m);
-	/** filename to write to */
-	boost::filesystem::path _file;
-};
-
-class NullLog : public Log
-{
-public:
-
-private:	
-	void do_log (std::string) {}
+	boost::signals2::scoped_connection _config_connection;
 };
 
 #endif