X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Flog.cc;h=b7edd4e29d93d0a0cde0c9c87f1c77e5b11fecea;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=650384bc7726986ff97800613f0ef09f2a41346f;hpb=e1e7827d75df6ea11b6bfd2aabd3eb3fb1f2e701;p=dcpomatic.git

diff --git a/src/lib/log.cc b/src/lib/log.cc
index 650384bc7..b7edd4e29 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,73 +22,79 @@
  *  @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 "string_log_entry.h"
+#include <time.h>
+#include <cstdio>
 
-using namespace std;
+#include "i18n.h"
+
+using std::string;
+using std::cout;
+using boost::shared_ptr;
 
 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 (shared_ptr<const LogEntry> e)
 {
 	boost::mutex::scoped_lock lm (_mutex);
 
-	if (l > _level) {
+	if ((_types & e->type()) == 0) {
 		return;
 	}
 
-	time_t t;
-	time (&t);
-	string a = ctime (&t);
-
-	stringstream s;
-	s << a.substr (0, a.length() - 1) << ": " << m;
-	do_log (s.str ());
+	do_log (e);
 }
 
+/** @param n String to log */
 void
-Log::microsecond_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;
 	}
 
-	struct timeval tv;
-	gettimeofday (&tv, 0);
+	shared_ptr<StringLogEntry> e (new StringLogEntry (type, message));
 
-	stringstream s;
-	s << tv.tv_sec << ":" << tv.tv_usec << " " << m;
-	do_log (s.str ());
-}	
-
-void
-Log::set_level (Level l)
-{
-	boost::mutex::scoped_lock lm (_mutex);
-	_level = l;
+	do_log (e);
 }
 
-
-/** @param file Filename to write log to */
-FileLog::FileLog (string file)
-	: _file (file)
+void
+Log::dcp_log (dcp::NoteType type, string m)
 {
-
+	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;
+	}
 }
 
 void
-FileLog::do_log (string m)
+Log::set_types (int t)
 {
-	ofstream f (_file.c_str(), fstream::app);
-	f << m << "\n";
+	boost::mutex::scoped_lock lm (_mutex);
+	_types = t;
 }
-