projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix errors when adding reels containing audio after referenced reels (#1528).
[dcpomatic.git]
/
src
/
lib
/
log_entry.cc
diff --git
a/src/lib/log_entry.cc
b/src/lib/log_entry.cc
index 99443e34af54fbf55165630c0e77fba811677355..6a36c3383aa5d575ef85ca7020dc0cc992deba7d 100644
(file)
--- a/
src/lib/log_entry.cc
+++ b/
src/lib/log_entry.cc
@@
-1,24
+1,26
@@
/*
Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 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/>.
*/
#include "log_entry.h"
*/
#include "log_entry.h"
-#include "safe_stringstream.h"
+#include <inttypes.h>
+#include <cstdio>
#include "i18n.h"
#include "i18n.h"
@@
-29,6
+31,7
@@
int const LogEntry::TYPE_DEBUG_DECODE = 0x8;
int const LogEntry::TYPE_DEBUG_ENCODE = 0x10;
int const LogEntry::TYPE_TIMING = 0x20;
int const LogEntry::TYPE_DEBUG_EMAIL = 0x40;
int const LogEntry::TYPE_DEBUG_ENCODE = 0x10;
int const LogEntry::TYPE_TIMING = 0x20;
int const LogEntry::TYPE_DEBUG_EMAIL = 0x40;
+int const LogEntry::TYPE_DEBUG_PLAYER = 0x80;
using std::string;
using std::string;
@@
-41,28
+44,30
@@
LogEntry::LogEntry (int type)
string
LogEntry::get () const
{
string
LogEntry::get () const
{
-
SafeStringStream
s;
+
string
s;
if (_type & TYPE_TIMING) {
if (_type & TYPE_TIMING) {
- s << _time.tv_sec << ":" << _time.tv_usec << " ";
+ char buffer[64];
+ snprintf (buffer, sizeof(buffer), "%" PRId64 ":%" PRId64 " ", static_cast<int64_t> (_time.tv_sec), static_cast<int64_t> (_time.tv_usec));
+ s += buffer;
} else {
char buffer[64];
time_t const sec = _time.tv_sec;
struct tm* t = localtime (&sec);
strftime (buffer, 64, "%c", t);
string a (buffer);
} else {
char buffer[64];
time_t const sec = _time.tv_sec;
struct tm* t = localtime (&sec);
strftime (buffer, 64, "%c", t);
string a (buffer);
- s
<< a <<
N_(": ");
+ s
+= string(buffer) +
N_(": ");
}
if (_type & TYPE_ERROR) {
}
if (_type & TYPE_ERROR) {
- s
<<
"ERROR: ";
+ s
+=
"ERROR: ";
}
if (_type & TYPE_WARNING) {
}
if (_type & TYPE_WARNING) {
- s
<<
"WARNING: ";
+ s
+=
"WARNING: ";
}
}
- s
<<
message ();
- return s
.str ()
;
+ s
+=
message ();
+ return s;
}
double
}
double