projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add --no-check to dcpomatic_cli.
[dcpomatic.git]
/
src
/
lib
/
log.cc
diff --git
a/src/lib/log.cc
b/src/lib/log.cc
index 2e5cc54e180aaeb8009123121f964d4db5fedcab..7851c133f9bc74f84a8cc912eecca63acd484b03 100644
(file)
--- a/
src/lib/log.cc
+++ b/
src/lib/log.cc
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012
-2015
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/>.
*/
*/
@@
-24,78
+25,47
@@
#include "log.h"
#include "cross.h"
#include "config.h"
#include "log.h"
#include "cross.h"
#include "config.h"
-#include "s
afe_stringstream
.h"
+#include "s
tring_log_entry
.h"
#include <time.h>
#include <cstdio>
#include "i18n.h"
#include <time.h>
#include <cstdio>
#include "i18n.h"
-using namespace std;
-
-int const Log::TYPE_GENERAL = 0x1;
-int const Log::TYPE_WARNING = 0x2;
-int const Log::TYPE_ERROR = 0x4;
-int const Log::TYPE_DEBUG_DECODE = 0x8;
-int const Log::TYPE_DEBUG_ENCODE = 0x10;
-int const Log::TYPE_TIMING = 0x20;
+using std::string;
+using std::cout;
+using boost::shared_ptr;
Log::Log ()
: _types (0)
{
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 ());
}
}
-/** @param n String to log */
void
void
-Log::log (s
tring message, int typ
e)
+Log::log (s
hared_ptr<const LogEntry>
e)
{
boost::mutex::scoped_lock lm (_mutex);
{
boost::mutex::scoped_lock lm (_mutex);
- if ((_types &
type
) == 0) {
+ if ((_types &
e->type()
) == 0) {
return;
}
return;
}
- time_t t;
- time (&t);
- string a = ctime (&t);
-
- SafeStringStream s;
- s << a.substr (0, a.length() - 1) << N_(": ");
-
- if (type & TYPE_ERROR) {
- s << "ERROR: ";
- }
-
- if (type & TYPE_WARNING) {
- s << "WARNING: ";
- }
-
- s << message;
- do_log (s.str ());
+ do_log (e);
}
}
+/** @param n String to log */
void
void
-Log::
microsecond_log (string m, int t
)
+Log::
log (string message, int type
)
{
boost::mutex::scoped_lock lm (_mutex);
{
boost::mutex::scoped_lock lm (_mutex);
- if ((_types & t) == 0) {
+ if ((_types & t
ype
) == 0) {
return;
}
return;
}
- struct timeval tv;
- gettimeofday (&tv, 0);
+ shared_ptr<StringLogEntry> e (new StringLogEntry (type, message));
- SafeStringStream s;
- s << tv.tv_sec << N_(":") << tv.tv_usec << N_(" ") << m;
- do_log (s.str ());
+ do_log (e);
}
void
}
void
@@
-103,13
+73,13
@@
Log::dcp_log (dcp::NoteType type, string m)
{
switch (type) {
case dcp::DCP_PROGRESS:
{
switch (type) {
case dcp::DCP_PROGRESS:
-
log (m, TYPE_GENERAL
);
+
do_log (shared_ptr<const LogEntry> (new StringLogEntry (LogEntry::TYPE_GENERAL, m))
);
break;
case dcp::DCP_ERROR:
break;
case dcp::DCP_ERROR:
-
log (m, TYPE_ERROR
);
+
do_log (shared_ptr<const LogEntry> (new StringLogEntry (LogEntry::TYPE_ERROR, m))
);
break;
case dcp::DCP_NOTE:
break;
case dcp::DCP_NOTE:
-
log (m, TYPE_WARNING
);
+
do_log (shared_ptr<const LogEntry> (new StringLogEntry (LogEntry::TYPE_WARNING, m))
);
break;
}
}
break;
}
}