X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Flog.cc;h=7851c133f9bc74f84a8cc912eecca63acd484b03;hp=4de6bd874e94c4c97feed165a210de7b10169936;hb=a5be11a965c2c38442e4e069874e7e21b5b43a5c;hpb=4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad

diff --git a/src/lib/log.cc b/src/lib/log.cc
index 4de6bd874..7851c133f 100644
--- a/src/lib/log.cc
+++ b/src/lib/log.cc
@@ -1,19 +1,20 @@
 /*
-    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
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -21,32 +22,35 @@
  *  @brief A very simple logging class.
  */
 
-#include <time.h>
-#include <cstdio>
 #include "log.h"
 #include "cross.h"
 #include "config.h"
+#include "string_log_entry.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_TIMING  = 0x8;
+using std::string;
+using std::cout;
+using boost::shared_ptr;
 
 Log::Log ()
 	: _types (0)
 {
-	_config_connection = Config::instance()->Changed.connect (boost::bind (&Log::config_changed, this));
-	config_changed ();
+
 }
 
 void
-Log::config_changed ()
+Log::log (shared_ptr<const LogEntry> e)
 {
-	set_types (Config::instance()->log_types ());
+	boost::mutex::scoped_lock lm (_mutex);
+
+	if ((_types & e->type()) == 0) {
+		return;
+	}
+
+	do_log (e);
 }
 
 /** @param n String to log */
@@ -59,41 +63,26 @@ Log::log (string message, int type)
 		return;
 	}
 
-	time_t t;
-	time (&t);
-	string a = ctime (&t);
-
-	stringstream s;
-	s << a.substr (0, a.length() - 1) << N_(": ");
+	shared_ptr<StringLogEntry> e (new StringLogEntry (type, message));
 
-	if (type & TYPE_ERROR) {
-		s << "ERROR: ";
-	}
-
-	if (type & TYPE_WARNING) {
-		s << "WARNING: ";
-	}
-	
-	s << message;
-	do_log (s.str ());
+	do_log (e);
 }
 
 void
-Log::microsecond_log (string m, int t)
+Log::dcp_log (dcp::NoteType type, string m)
 {
-	boost::mutex::scoped_lock lm (_mutex);
-
-	if ((_types & t) == 0) {
-		return;
+	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;
 	}
-
-	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)
@@ -101,24 +90,3 @@ Log::set_types (int t)
 	boost::mutex::scoped_lock lm (_mutex);
 	_types = t;
 }
-
-/** @param file Filename to write log to */
-FileLog::FileLog (boost::filesystem::path file)
-	: _file (file)
-{
-
-}
-
-void
-FileLog::do_log (string m)
-{
-	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);
-}
-