projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++11 tidying.
[dcpomatic.git]
/
src
/
lib
/
log.cc
diff --git
a/src/lib/log.cc
b/src/lib/log.cc
index e3ffd1cadcc05f4f114e107df4e870d46ce0a3f6..97b6498938cc1f0992c76829b3e4f1110b4a9f14 100644
(file)
--- a/
src/lib/log.cc
+++ b/
src/lib/log.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,10
+18,12
@@
*/
*/
+
/** @file src/log.cc
* @brief A very simple logging class.
*/
/** @file src/log.cc
* @brief A very simple logging class.
*/
+
#include "log.h"
#include "cross.h"
#include "config.h"
#include "log.h"
#include "cross.h"
#include "config.h"
@@
-31,23
+33,19
@@
#include "i18n.h"
#include "i18n.h"
+
using std::string;
using std::cout;
using std::string;
using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::make_shared;
+
Log::Log ()
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)
{
void
Log::log (shared_ptr<const LogEntry> e)
{
@@
-60,6
+58,7
@@
Log::log (shared_ptr<const LogEntry> e)
do_log (e);
}
do_log (e);
}
+
/** @param n String to log */
void
Log::log (string message, int type)
/** @param n String to log */
void
Log::log (string message, int type)
@@
-70,27
+69,29
@@
Log::log (string message, int type)
return;
}
return;
}
-
shared_ptr<StringLogEntry> e (new StringLogEntry (type, message)
);
+
auto e = make_shared<StringLogEntry>(type, message
);
do_log (e);
}
do_log (e);
}
+
void
Log::dcp_log (dcp::NoteType type, string m)
{
switch (type) {
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;
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;
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;
}
}
break;
}
}
+
void
Log::set_types (int t)
{
void
Log::set_types (int t)
{