Supporters update.

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

diff --git a/src/lib/log.cc b/src/lib/log.cc
index c8ba74f23615ff5fe2108cecb346f118136add62..aae492faffd07826517d237150e48550dc0748c1 100644 (file)
--- a/src/lib/log.cc
+++ b/src/lib/log.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,37 +18,34 @@
 
 */
 
+
 /** @file src/log.cc
  *  @brief A very simple logging class.
  */
 
-#include "log.h"
-#include "cross.h"
+
 #include "config.h"
+#include "cross.h"
+#include "log.h"
 #include "string_log_entry.h"
-#include <locked_sstream.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)
 {
@@ -61,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)
@@ -71,27 +69,29 @@ Log::log (string message, int type)
                return;
        }
 
-       shared_ptr<StringLogEntry> e (new StringLogEntry (type, message));
+       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)
 {