X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Flog.cc;h=aae492faffd07826517d237150e48550dc0748c1;hb=182b9d2e2feb6545592868606aaf0f0146095481;hp=d4f469602065bc3f3776f26a87a1538c440b01aa;hpb=f0da433894308ed72b0dbdd116a30a8d659c33cc;p=dcpomatic.git

diff --git a/src/lib/log.cc b/src/lib/log.cc
index d4f469602..aae492faf 100644
--- a/src/lib/log.cc
+++ b/src/lib/log.cc
@@ -1,53 +1,51 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 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/>.
 
 */
 
+
 /** @file src/log.cc
  *  @brief A very simple logging class.
  */
 
-#include "log.h"
-#include "cross.h"
+
 #include "config.h"
-#include "safe_stringstream.h"
+#include "cross.h"
+#include "log.h"
 #include "string_log_entry.h"
 #include <time.h>
 #include <cstdio>
 
 #include "i18n.h"
 
-using std::string;
+
 using std::cout;
-using boost::shared_ptr;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
+
 
 Log::Log ()
-	: _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 ());
 }
 
+
 void
 Log::log (shared_ptr<const LogEntry> e)
 {
@@ -60,6 +58,7 @@ Log::log (shared_ptr<const LogEntry> e)
 	do_log (e);
 }
 
+
 /** @param n String to log */
 void
 Log::log (string message, int type)
@@ -70,31 +69,29 @@ Log::log (string message, int type)
 		return;
 	}
 
-	shared_ptr<StringLogEntry> e (new StringLogEntry (type, message));
-
-#ifdef DCPOMATIC_DEBUG
-	cout << e->get() << "\n";
-#endif
+	auto e = make_shared<StringLogEntry>(type, message);
 
 	do_log (e);
 }
 
+
 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)));
+	case dcp::NoteType::PROGRESS:
+		do_log (make_shared<StringLogEntry>(LogEntry::TYPE_GENERAL, m));
 		break;
-	case dcp::DCP_ERROR:
-		do_log (shared_ptr<const LogEntry> (new StringLogEntry (LogEntry::TYPE_ERROR, m)));
+	case dcp::NoteType::ERROR:
+		do_log (make_shared<StringLogEntry>(LogEntry::TYPE_ERROR, m));
 		break;
-	case dcp::DCP_NOTE:
-		do_log (shared_ptr<const LogEntry> (new StringLogEntry (LogEntry::TYPE_WARNING, m)));
+	case dcp::NoteType::NOTE:
+		do_log (make_shared<StringLogEntry>(LogEntry::TYPE_WARNING, m));
 		break;
 	}
 }
 
+
 void
 Log::set_types (int t)
 {