X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Flog.cc;h=0f7a59ff84b598f9b997ad0cd7ca9b29019c55b7;hp=a2f420ce1b0b8211f0cd3d6e23d759a00c477afc;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hpb=2935d9d158cf35496a35107f9c4ab7d2929cf6c3

diff --git a/src/lib/log.cc b/src/lib/log.cc
index a2f420ce1..0f7a59ff8 100644
--- a/src/lib/log.cc
+++ b/src/lib/log.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,28 +21,23 @@
  *  @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 "string_log_entry.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::TYPE_GENERAL = 0x1;
-int const Log::TYPE_WARNING = 0x2;
-int const Log::TYPE_ERROR   = 0x4;
-int const Log::TYPE_TIMING  = 0x8;
+using std::string;
+using boost::shared_ptr;
 
 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 ();
 }
 
@@ -52,100 +47,50 @@ Log::config_changed ()
 	set_types (Config::instance()->log_types ());
 }
 
-/** @param n String to log */
 void
-Log::log (string message, int type)
+Log::log (shared_ptr<const LogEntry> e)
 {
 	boost::mutex::scoped_lock lm (_mutex);
 
-	if ((_types & type) == 0) {
+	if ((_types & e->type()) == 0) {
 		return;
 	}
 
-	time_t t;
-	time (&t);
-	string a = ctime (&t);
-
-	stringstream 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 ());
+	do_log (e);
 }
 
+/** @param n String to log */
 void
-Log::microsecond_log (string m, int t)
+Log::log (string message, int type)
 {
 	boost::mutex::scoped_lock lm (_mutex);
 
-	if ((_types & t) == 0) {
+	if ((_types & type) == 0) {
 		return;
 	}
 
-	struct timeval tv;
-	gettimeofday (&tv, 0);
-
-	stringstream 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;
+	do_log (shared_ptr<const LogEntry> (new StringLogEntry (type, message)));
 }
 
-/** @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 |= TYPE_GENERAL;
-		} else if (*i == N_("warning")) {
-			_types |= TYPE_WARNING;
-		} else if (*i == N_("error")) {
-			_types |= TYPE_ERROR;
-		} else if (*i == N_("timing")) {
-			_types |= TYPE_TIMING;
-		}
+	switch (type) {
+	case dcp::DCP_PROGRESS:
+		do_log (shared_ptr<const LogEntry> (new StringLogEntry (LogEntry::TYPE_GENERAL, m)));
+		break;
+	case dcp::DCP_ERROR:
+		do_log (shared_ptr<const LogEntry> (new StringLogEntry (LogEntry::TYPE_ERROR, m)));
+		break;
+	case dcp::DCP_NOTE:
+		do_log (shared_ptr<const LogEntry> (new StringLogEntry (LogEntry::TYPE_WARNING, m)));
+		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;
 }
-