Tidy up logging a bit. Make it configurable from the GUI.

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

diff --git a/src/lib/log.h b/src/lib/log.h
index 991532404293a7a01fc59762b3b1b8b0d15af6ec..641ce186d40cf72fdfaf8f75e571ea470e7c5d90 100644 (file)
--- a/src/lib/log.h
+++ b/src/lib/log.h
@@ -37,17 +37,16 @@ public:
        Log ();
        virtual ~Log () {}
 
-       enum Level {
-               STANDARD = 0,
-               VERBOSE = 1,
-               TIMING = 2
-       };
+       static const int GENERAL;
+       static const int WARNING;
+       static const int ERROR;
+       static const int 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);
+       void set_types (std::string types);
 
 protected:     
        /** mutex to protect the log */
@@ -55,9 +54,10 @@ protected:
        
 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;
 };
 
 class FileLog : public Log