Fix crash due to lack of signal disconnection.

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

diff --git a/src/lib/log.h b/src/lib/log.h
index 6a911b13f29c64dd742beef1eee54a6b6429e0e1..94d30de4ecbb109a8b557bc145041c2517685899 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,27 +38,25 @@ 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_TIMING;
 
-       void log (std::string m, Level l = STANDARD);
-       void microsecond_log (std::string m, Level l = STANDARD);
+       void log (std::string message, int type);
+       void microsecond_log (std::string message, int type);
 
-       void set_level (Level l);
-       void set_level (std::string l);
+       void set_types (int types);
 
-protected:     
-       /** mutex to protect the log */
-       boost::mutex _mutex;
-       
 private:
        virtual void do_log (std::string m) = 0;
+       void config_changed ();
        
-       /** level above which to ignore log messages */
-       Level _level;
+       /** mutex to protect the log */
+       boost::mutex _mutex;
+       /** 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
@@ -71,4 +70,12 @@ private:
        boost::filesystem::path _file;
 };
 
+class NullLog : public Log
+{
+public:
+
+private:       
+       void do_log (std::string) {}
+};
+
 #endif