projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rearrange subtitle font management.
[dcpomatic.git]
/
src
/
lib
/
log.cc
diff --git
a/src/lib/log.cc
b/src/lib/log.cc
index 0f7a59ff84b598f9b997ad0cd7ca9b29019c55b7..aae492faffd07826517d237150e48550dc0748c1 100644
(file)
--- a/
src/lib/log.cc
+++ b/
src/lib/log.cc
@@
-1,52
+1,51
@@
/*
/*
- Copyright (C) 2012-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
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.
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
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.
*/
/** @file src/log.cc
* @brief A very simple logging class.
*/
-#include "log.h"
-#include "cross.h"
+
#include "config.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"
#include "string_log_entry.h"
#include <time.h>
#include <cstdio>
#include "i18n.h"
+
+using std::cout;
+using std::make_shared;
+using std::shared_ptr;
using std::string;
using std::string;
-using boost::shared_ptr;
+
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)
{
@@
-59,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)
@@
-69,25
+69,29
@@
Log::log (string message, int type)
return;
}
return;
}
- do_log (shared_ptr<const LogEntry> (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) {
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)
{