X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Flog.h;h=1b7cef03891c107d979bb465ed05ef6e8700b24f;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=f20b0a14866b5aedda0b3b4de883e7b40d3cc7c3;hpb=90ec60c9e5b45453525368842345ad1a6498fa61;p=dcpomatic.git

diff --git a/src/lib/log.h b/src/lib/log.h
index f20b0a148..1b7cef038 100644
--- a/src/lib/log.h
+++ b/src/lib/log.h
@@ -24,10 +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.
@@ -41,24 +42,26 @@ public:
 	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 set_types (int types);
 
-	virtual std::string head_and_tail () const = 0;
+	virtual std::string head_and_tail (int amount = 1024) const = 0;
 
 protected:
-	
+
 	/** mutex to protect the log */
 	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;
 	boost::signals2::scoped_connection _config_connection;
@@ -69,7 +72,7 @@ class FileLog : public Log
 public:
 	FileLog (boost::filesystem::path file);
 
-	std::string head_and_tail () const;
+	std::string head_and_tail (int amount = 1024) const;
 
 private:
 	void do_log (std::string m);
@@ -80,11 +83,11 @@ private:
 class NullLog : public Log
 {
 public:
-	std::string head_and_tail () const {
+	std::string head_and_tail (int) const {
 		return "";
 	}
 
-private:	
+private:
 	void do_log (std::string) {}
 };