Rename TYPE_DEBUG_PLAYER to TYPE_DEBUG_VIDEO_VIEW.

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

diff --git a/src/lib/log_entry.cc b/src/lib/log_entry.cc
index 53605c389546e04f139449348e932188241fab79..01d1415c701fbe4d218c1abb54a5e097b6bd5c66 100644 (file)
--- a/src/lib/log_entry.cc
+++ b/src/lib/log_entry.cc
@@ -19,17 +19,20 @@
 */
 
 #include "log_entry.h"
 */
 
 #include "log_entry.h"

-#include <locked_sstream.h>
+#include <inttypes.h>
+#include <cstdio>

 
 #include "i18n.h"
 
 
 #include "i18n.h"
 

-int const LogEntry::TYPE_GENERAL      = 0x1;
-int const LogEntry::TYPE_WARNING      = 0x2;
-int const LogEntry::TYPE_ERROR        = 0x4;
-int const LogEntry::TYPE_DEBUG_DECODE = 0x8;
-int const LogEntry::TYPE_DEBUG_ENCODE = 0x10;
-int const LogEntry::TYPE_TIMING       = 0x20;
-int const LogEntry::TYPE_DEBUG_EMAIL  = 0x40;
+int const LogEntry::TYPE_GENERAL      = 0x001;
+int const LogEntry::TYPE_WARNING      = 0x002;
+int const LogEntry::TYPE_ERROR        = 0x004;
+int const LogEntry::TYPE_DEBUG_THREED = 0x008;
+int const LogEntry::TYPE_DEBUG_ENCODE = 0x010;
+int const LogEntry::TYPE_TIMING       = 0x020;
+int const LogEntry::TYPE_DEBUG_EMAIL  = 0x040;
+int const LogEntry::TYPE_DEBUG_VIDEO_VIEW = 0x080;
+int const LogEntry::TYPE_DISK         = 0x100;

 
 using std::string;
 
 
 using std::string;
 


@@ -42,28 +45,30 @@ LogEntry::LogEntry (int type)
 string
 LogEntry::get () const
 {
 string
 LogEntry::get () const
 {

-       locked_stringstream s;
+       string s;

        if (_type & TYPE_TIMING) {
        if (_type & TYPE_TIMING) {

-               s << _time.tv_sec << ":" << _time.tv_usec << " ";
+               char buffer[64];
+               snprintf (buffer, sizeof(buffer), "%" PRId64 ":%" PRId64 " ", static_cast<int64_t> (_time.tv_sec), static_cast<int64_t> (_time.tv_usec));
+               s += buffer;

        } else {
                char buffer[64];
                time_t const sec = _time.tv_sec;
                struct tm* t = localtime (&sec);
                strftime (buffer, 64, "%c", t);
                string a (buffer);
        } else {
                char buffer[64];
                time_t const sec = _time.tv_sec;
                struct tm* t = localtime (&sec);
                strftime (buffer, 64, "%c", t);
                string a (buffer);

-               s << a << N_(": ");
+               s += string(buffer) + N_(": ");

        }
 
        if (_type & TYPE_ERROR) {
        }
 
        if (_type & TYPE_ERROR) {

-               s << "ERROR: ";
+               s += "ERROR: ";

        }
 
        if (_type & TYPE_WARNING) {
        }
 
        if (_type & TYPE_WARNING) {

-               s << "WARNING: ";
+               s += "WARNING: ";

        }
 
        }
 

-       s << message ();
-       return s.str ();
+       s += message ();
+       return s;

 }
 
 double
 }
 
 double