projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix seconds_to_approximate_hms sometimes saying things like 1h60m (#1314).
[dcpomatic.git]
/
src
/
lib
/
encoded_log_entry.cc
diff --git
a/src/lib/encoded_log_entry.cc
b/src/lib/encoded_log_entry.cc
index a81803418f98c079ab1cb6fa810dd2f645198461..2da84dacdd0a1946c9e2709ef6e288444787d1c8 100644
(file)
--- a/
src/lib/encoded_log_entry.cc
+++ b/
src/lib/encoded_log_entry.cc
@@
-1,27
+1,27
@@
/*
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 "encoded_log_entry.h"
*/
#include "encoded_log_entry.h"
-#include
"safe_stringstream.h"
+#include
<cstdio>
using std::string;
using std::string;
-using std::fixed;
EncodedLogEntry::EncodedLogEntry (int frame, string ip, double receive, double encode, double send)
: LogEntry (LogEntry::TYPE_GENERAL)
EncodedLogEntry::EncodedLogEntry (int frame, string ip, double receive, double encode, double send)
: LogEntry (LogEntry::TYPE_GENERAL)
@@
-37,13
+37,7
@@
EncodedLogEntry::EncodedLogEntry (int frame, string ip, double receive, double e
string
EncodedLogEntry::message () const
{
string
EncodedLogEntry::message () const
{
- SafeStringStream m;
- m.precision (2);
- m << fixed
- << "Encoded frame " << _frame << " from " << _ip << ": "
- << "receive " << _receive << "s "
- << "encode " << _encode << "s "
- << "send " << _send << "s.";
-
- return m.str ();
+ char buffer[256];
+ snprintf (buffer, sizeof(buffer), "Encoded frame %d from %s: receive %.2fs encode %.2fs send %.2fs.", _frame, _ip.c_str(), _receive, _encode, _send);
+ return buffer;
}
}