Adapt for libdcp use of enum class.

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

diff --git a/src/lib/log.cc b/src/lib/log.cc
index e3ffd1cadcc05f4f114e107df4e870d46ce0a3f6..f84cfd3a51cf38b2a1c0e04223e9fdd4ff913cf6 100644 (file)
--- a/src/lib/log.cc
+++ b/src/lib/log.cc
@@ -31,21 +31,17 @@
 
 #include "i18n.h"
 
+
 using std::string;
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::make_shared;
+
 
 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
@@ -70,7 +66,7 @@ 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);
 }
@@ -79,14 +75,14 @@ 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;
        }
 }