Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/log.h b/src/lib/log.h
index 2a242e24c96e8f49bfb171d81bac463085ad9f02..2c44f32ceeebe507e17e9bd8a8c0d5df3f1b876e 100644 (file)
--- a/src/lib/log.h
+++ b/src/lib/log.h
@@ -17,53 +17,52 @@
 
 */
 
-#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.
  */
 
-#include <string>
+#include "log_entry.h"
+#include <dcp/types.h>
 #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
-       };
+       void log (boost::shared_ptr<const LogEntry> entry);
+       void log (std::string message, int type);
+       void dcp_log (dcp::NoteType type, std::string message);
 
-       void log (std::string m, Level l = STANDARD);
+       void set_types (int types);
 
-       void set_level (Level l);
+       /** @param amount Approximate number of bytes to return; the returned value
+        *  may be shorter or longer than this.
+        */
+       virtual std::string head_and_tail (int amount = 1024) const = 0;
 
-protected:     
-       /** mutex to protect the log */
-       boost::mutex _mutex;
-       
-private:
-       virtual void do_log (std::string m) = 0;
-       
-       /** level above which to ignore log messages */
-       Level _level;
-};
+protected:
 
-class FileLog : public Log
-{
-public:
-       FileLog (std::string file);
+       /** mutex to protect the log */
+       mutable boost::mutex _mutex;
 
 private:
-       void do_log (std::string m);
-       /** filename to write to */
-       std::string _file;
+       virtual void do_log (boost::shared_ptr<const LogEntry> entry) = 0;
+       void config_changed ();
+
+       /** bit-field of log types which should be put into the log (others are ignored) */
+       int _types;
+       boost::signals2::scoped_connection _config_connection;
 };
 
 #endif