Add log TYPE_DEBUG from 1.x.

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

diff --git a/src/lib/log.h b/src/lib/log.h
index 3ad6516c11b7b56ee270c269967bd3d59177e464..f14adc26fd054034893c589941498b887700df42 100644 (file)
--- a/src/lib/log.h
+++ b/src/lib/log.h
@@ -24,50 +24,69 @@
  *  @brief A very simple logging class.
  */
 
-#include <string>
 #include <boost/thread/mutex.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/signals2.hpp>
+#include <string>
 
 /** @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 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 log (std::string m, Level l = STANDARD);
-       void microsecond_log (std::string m, Level l = STANDARD);
+       void set_types (int types);
 
-       void set_level (Level l);
-       void set_level (std::string l);
+       virtual std::string head_and_tail (int amount = 1024) const = 0;
 
-protected:     
+protected:
+       
        /** mutex to protect the log */
-       boost::mutex _mutex;
+       mutable boost::mutex _mutex;
        
 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;
+       boost::signals2::scoped_connection _config_connection;
 };
 
 class FileLog : public Log
 {
 public:
-       FileLog (std::string file);
+       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 */
-       std::string _file;
+       boost::filesystem::path _file;
+};
+
+class NullLog : public Log
+{
+public:
+       std::string head_and_tail (int) const {
+               return "";
+       }
+
+private:       
+       void do_log (std::string) {}
 };
 
 #endif