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 298b425cd85e66aa23c11524e89626761592d5e6..641ce186d40cf72fdfaf8f75e571ea470e7c5d90 100644 (file)
--- a/src/lib/log.h
+++ b/src/lib/log.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_LOG_H
-#define DVDOMATIC_LOG_H
+#ifndef DCPOMATIC_LOG_H
+#define DCPOMATIC_LOG_H
 
 /** @file src/log.h
  *  @brief A very simple logging class.
@@ -26,26 +26,27 @@
 
 #include <string>
 #include <boost/thread/mutex.hpp>
+#include <boost/filesystem.hpp>
 
 /** @class Log
  *  @brief A very simple logging class.
  */
-class Log
+class Log : public boost::noncopyable
 {
 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_types (int types);
+       void set_types (std::string types);
 
 protected:     
        /** mutex to protect the log */
@@ -53,20 +54,29 @@ 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
 {
 public:
-       FileLog (std::string file);
+       FileLog (boost::filesystem::path file);
 
 private:
        void do_log (std::string m);
        /** filename to write to */
-       std::string _file;
+       boost::filesystem::path _file;
+};
+
+class NullLog : public Log
+{
+public:
+
+private:       
+       void do_log (std::string) {}
 };
 
 #endif