Fix duplicate name of _mutex in ExceptionStore and some of its children.

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

diff --git a/src/lib/log.cc b/src/lib/log.cc
index 7f1eea20634f8cba480d8d6884765f7e1be14268..2e5cc54e180aaeb8009123121f964d4db5fedcab 100644 (file)
--- a/src/lib/log.cc
+++ b/src/lib/log.cc
@@ -21,56 +21,102 @@
  *  @brief A very simple logging class.
  */
 
-#include <fstream>
-#include <time.h>
 #include "log.h"
+#include "cross.h"
+#include "config.h"
+#include "safe_stringstream.h"
+#include <time.h>
+#include <cstdio>
+
+#include "i18n.h"
 
 using namespace std;
 
+int const Log::TYPE_GENERAL      = 0x1;
+int const Log::TYPE_WARNING      = 0x2;
+int const Log::TYPE_ERROR        = 0x4;
+int const Log::TYPE_DEBUG_DECODE = 0x8;
+int const Log::TYPE_DEBUG_ENCODE = 0x10;
+int const Log::TYPE_TIMING       = 0x20;
+
 Log::Log ()
-       : _level (VERBOSE)
+       : _types (0)
 {
+       _config_connection = Config::instance()->Changed.connect (boost::bind (&Log::config_changed, this));
+       config_changed ();
+}
 
+void
+Log::config_changed ()
+{
+       set_types (Config::instance()->log_types ());
 }
 
 /** @param n String to log */
 void
-Log::log (string m, Level l)
+Log::log (string message, int type)
 {
        boost::mutex::scoped_lock lm (_mutex);
 
-       if (l > _level) {
+       if ((_types & type) == 0) {
                return;
        }
-       
+
        time_t t;
        time (&t);
        string a = ctime (&t);
 
-       stringstream s;
-       s << a.substr (0, a.length() - 1) << ": " << m;
+       SafeStringStream s;
+       s << a.substr (0, a.length() - 1) << N_(": ");
+
+       if (type & TYPE_ERROR) {
+               s << "ERROR: ";
+       }
+
+       if (type & TYPE_WARNING) {
+               s << "WARNING: ";
+       }
+
+       s << message;
        do_log (s.str ());
 }
 
 void
-Log::set_level (Level l)
+Log::microsecond_log (string m, int t)
 {
        boost::mutex::scoped_lock lm (_mutex);
-       _level = l;
-}
 
+       if ((_types & t) == 0) {
+               return;
+       }
 
-/** @param file Filename to write log to */
-FileLog::FileLog (string file)
-       : _file (file)
-{
+       struct timeval tv;
+       gettimeofday (&tv, 0);
 
+       SafeStringStream s;
+       s << tv.tv_sec << N_(":") << tv.tv_usec << N_(" ") << m;
+       do_log (s.str ());
 }
 
 void
-FileLog::do_log (string m)
+Log::dcp_log (dcp::NoteType type, string m)
 {
-       ofstream f (_file.c_str(), fstream::app);
-       f << m << "\n";
+       switch (type) {
+       case dcp::DCP_PROGRESS:
+               log (m, TYPE_GENERAL);
+               break;
+       case dcp::DCP_ERROR:
+               log (m, TYPE_ERROR);
+               break;
+       case dcp::DCP_NOTE:
+               log (m, TYPE_WARNING);
+               break;
+       }
 }
 
+void
+Log::set_types (int t)
+{
+       boost::mutex::scoped_lock lm (_mutex);
+       _types = t;
+}