projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.
[dcpomatic.git]
/
src
/
lib
/
util.cc
diff --git
a/src/lib/util.cc
b/src/lib/util.cc
index f3795c26406c75a6b4e286cde16510a93b2e8ca7..4a0965858eabbf07aa0c156f5714eeb50d2f7ec7 100644
(file)
--- a/
src/lib/util.cc
+++ b/
src/lib/util.cc
@@
-35,8
+35,8
@@
#include "rect.h"
#include "digester.h"
#include "audio_processor.h"
#include "rect.h"
#include "digester.h"
#include "audio_processor.h"
-#include "safe_stringstream.h"
#include "compose.hpp"
#include "compose.hpp"
+#include <locked_sstream.h>
#include <dcp/util.h>
#include <dcp/picture_asset.h>
#include <dcp/sound_asset.h>
#include <dcp/util.h>
#include <dcp/picture_asset.h>
#include <dcp/sound_asset.h>
@@
-115,7
+115,7
@@
seconds_to_hms (int s)
int h = m / 60;
m -= (h * 60);
int h = m / 60;
m -= (h * 60);
-
SafeStringS
tream hms;
+
locked_strings
tream hms;
hms << h << N_(":");
hms.width (2);
hms << setfill ('0') << m << N_(":");
hms << h << N_(":");
hms.width (2);
hms << setfill ('0') << m << N_(":");
@@
-136,7
+136,7
@@
seconds_to_approximate_hms (int s)
int h = m / 60;
m -= (h * 60);
int h = m / 60;
m -= (h * 60);
-
SafeStringS
tream ap;
+
locked_strings
tream ap;
bool const hours = h > 0;
bool const minutes = h < 6 && m > 0;
bool const hours = h > 0;
bool const minutes = h < 6 && m > 0;