Hand-apply 63b62aa703c2628b27b577114081b265f237dadb from master;

[dcpomatic.git] / src / lib / log.h

diff --git a/src/lib/log.h b/src/lib/log.h
index 641ce186d40cf72fdfaf8f75e571ea470e7c5d90..cee1ce495e1a3f2fc8e5dd3a3a2882fba0b552a6 100644 (file)
--- a/src/lib/log.h
+++ b/src/lib/log.h
@@ -27,6 +27,7 @@
 #include <string>
 #include <boost/thread/mutex.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/signals2.hpp>
 
 /** @class Log
  *  @brief A very simple logging class.
@@ -37,20 +38,22 @@ public:
        Log ();
        virtual ~Log () {}
 
-       static const int GENERAL;
-       static const int WARNING;
-       static const int ERROR;
-       static const int TIMING;
+       static const int TYPE_GENERAL;
+       static const int TYPE_WARNING;
+       static const int TYPE_ERROR;
+       static const int TYPE_TIMING;
 
        void log (std::string message, int type);
        void microsecond_log (std::string message, int type);
 
        void set_types (int types);
-       void set_types (std::string 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;
@@ -58,6 +61,7 @@ private:
        
        /** 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
@@ -65,6 +69,8 @@ class FileLog : public Log
 public:
        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 */
@@ -74,6 +80,9 @@ private:
 class NullLog : public Log
 {
 public:
+       std::string head_and_tail (int) const {
+               return "";
+       }
 
 private:       
        void do_log (std::string) {}