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 f14adc26fd054034893c589941498b887700df42..2c44f32ceeebe507e17e9bd8a8c0d5df3f1b876e 100644 (file)
--- a/src/lib/log.h
+++ b/src/lib/log.h
@@ -24,6 +24,8 @@
  *  @brief A very simple logging class.
  */
 
+#include "log_entry.h"
+#include <dcp/types.h>
 #include <boost/thread/mutex.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/signals2.hpp>
@@ -38,55 +40,29 @@ public:
        Log ();
        virtual ~Log () {}
 
-       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 (boost::shared_ptr<const LogEntry> entry);
        void log (std::string message, int type);
-       void microsecond_log (std::string message, int type);
+       void dcp_log (dcp::NoteType type, std::string message);
 
        void set_types (int types);
 
+       /** @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 */
        mutable boost::mutex _mutex;
-       
+
 private:
-       virtual void do_log (std::string m) = 0;
+       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;
 };
 
-class FileLog : public Log
-{
-public:
-       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 */
-       boost::filesystem::path _file;
-};
-
-class NullLog : public Log
-{
-public:
-       std::string head_and_tail (int) const {
-               return "";
-       }
-
-private:       
-       void do_log (std::string) {}
-};
-
 #endif