X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Flog.cc;h=aae492faffd07826517d237150e48550dc0748c1;hb=182b9d2e2feb6545592868606aaf0f0146095481;hp=769852044348cebbbafc37ba66c02656928bb513;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;p=dcpomatic.git diff --git a/src/lib/log.cc b/src/lib/log.cc index 769852044..aae492faf 100644 --- a/src/lib/log.cc +++ b/src/lib/log.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,39 +18,34 @@ */ + /** @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 #include #include #include "i18n.h" -using std::string; + using std::cout; -using boost::shared_ptr; -using boost::make_shared; +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 e) { @@ -63,6 +58,7 @@ Log::log (shared_ptr e) do_log (e); } + /** @param n String to log */ void Log::log (string message, int type) @@ -73,27 +69,29 @@ Log::log (string message, int type) return; } - shared_ptr e = boost::make_shared (type, message); + auto e = make_shared(type, message); do_log (e); } + void Log::dcp_log (dcp::NoteType type, string m) { switch (type) { - case dcp::DCP_PROGRESS: - do_log (boost::make_shared (LogEntry::TYPE_GENERAL, m)); + case dcp::NoteType::PROGRESS: + do_log (make_shared(LogEntry::TYPE_GENERAL, m)); break; - case dcp::DCP_ERROR: - do_log (boost::make_shared (LogEntry::TYPE_ERROR, m)); + case dcp::NoteType::ERROR: + do_log (make_shared(LogEntry::TYPE_ERROR, m)); break; - case dcp::DCP_NOTE: - do_log (boost::make_shared (LogEntry::TYPE_WARNING, m)); + case dcp::NoteType::NOTE: + do_log (make_shared(LogEntry::TYPE_WARNING, m)); break; } } + void Log::set_types (int t) {