Optimise checking of existing image data.

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

diff --git a/src/lib/log.cc b/src/lib/log.cc
index be32315d108a5bad7c84d49dd8c5a858f452fa39..2e5cc54e180aaeb8009123121f964d4db5fedcab 100644 (file)
--- a/src/lib/log.cc
+++ b/src/lib/log.cc
@@ -21,28 +21,28 @@
  *  @brief A very simple logging class.
  */
 
-#include <time.h>
-#include <cstdio>
-#include <boost/algorithm/string.hpp>
 #include "log.h"
 #include "cross.h"
 #include "config.h"
+#include "safe_stringstream.h"
+#include <time.h>
+#include <cstdio>
 
 #include "i18n.h"
 
 using namespace std;
-using boost::algorithm::is_any_of;
-using boost::algorithm::split;
 
-int const Log::GENERAL = 0x1;
-int const Log::WARNING = 0x2;
-int const Log::ERROR   = 0x4;
-int const Log::TIMING  = 0x8;
+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 ()
        : _types (0)
 {
-       Config::instance()->Changed.connect (boost::bind (&Log::config_changed, this));
+       _config_connection = Config::instance()->Changed.connect (boost::bind (&Log::config_changed, this));
        config_changed ();
 }
 
@@ -66,17 +66,17 @@ Log::log (string message, int type)
        time (&t);
        string a = ctime (&t);
 
-       stringstream s;
+       SafeStringStream s;
        s << a.substr (0, a.length() - 1) << N_(": ");
 
-       if (type & ERROR) {
+       if (type & TYPE_ERROR) {
                s << "ERROR: ";
        }
 
-       if (type & WARNING) {
+       if (type & TYPE_WARNING) {
                s << "WARNING: ";
        }
-       
+
        s << message;
        do_log (s.str ());
 }
@@ -93,59 +93,30 @@ Log::microsecond_log (string m, int t)
        struct timeval tv;
        gettimeofday (&tv, 0);
 
-       stringstream s;
+       SafeStringStream s;
        s << tv.tv_sec << N_(":") << tv.tv_usec << N_(" ") << m;
        do_log (s.str ());
-}      
-
-void
-Log::set_types (int t)
-{
-       boost::mutex::scoped_lock lm (_mutex);
-       _types = t;
 }
 
-/** @param A comma-separate list of debug types to enable */
 void
-Log::set_types (string t)
+Log::dcp_log (dcp::NoteType type, string m)
 {
-       boost::mutex::scoped_lock lm (_mutex);
-
-       vector<string> types;
-       split (types, t, is_any_of (","));
-
-       _types = 0;
-
-       for (vector<string>::const_iterator i = types.begin(); i != types.end(); ++i) {
-               if (*i == N_("general")) {
-                       _types |= GENERAL;
-               } else if (*i == N_("warning")) {
-                       _types |= WARNING;
-               } else if (*i == N_("error")) {
-                       _types |= ERROR;
-               } else if (*i == N_("timing")) {
-                       _types |= TIMING;
-               }
+       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;
        }
 }
 
-/** @param file Filename to write log to */
-FileLog::FileLog (boost::filesystem::path file)
-       : _file (file)
-{
-
-}
-
 void
-FileLog::do_log (string m)
+Log::set_types (int t)
 {
-       FILE* f = fopen_boost (_file, "a");
-       if (!f) {
-               cout << "(could not log to " << _file.string() << "): " << m << "\n";
-               return;
-       }
-
-       fprintf (f, "%s\n", m.c_str ());
-       fclose (f);
+       boost::mutex::scoped_lock lm (_mutex);
+       _types = t;
 }
-