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
/
image_content.cc
diff --git
a/src/lib/image_content.cc
b/src/lib/image_content.cc
index d4e73677113dd72a64396ae1bb0c6822d1f5fb60..08b9fd6ae475a364dd367f48274ef28e23ebf5d0 100644
(file)
--- a/
src/lib/image_content.cc
+++ b/
src/lib/image_content.cc
@@
-26,8
+26,8
@@
#include "job.h"
#include "frame_rate_change.h"
#include "exceptions.h"
#include "job.h"
#include "frame_rate_change.h"
#include "exceptions.h"
-#include "safe_stringstream.h"
#include "image_filename_sorter.h"
#include "image_filename_sorter.h"
+#include <locked_sstream.h>
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
#include <boost/foreach.hpp>
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
#include <boost/foreach.hpp>
@@
-136,7
+136,7
@@
ImageContent::full_length () const
string
ImageContent::identifier () const
{
string
ImageContent::identifier () const
{
-
SafeStringS
tream s;
+
locked_strings
tream s;
s << Content::identifier();
s << "_" << video->identifier ();
s << "_" << video->length();
s << Content::identifier();
s << "_" << video->identifier ();
s << "_" << video->length();