diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-07-22 10:06:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-07-22 10:06:10 +0100 |
| commit | 422be0eece2bf6ee80db1d3c21553cd82efff789 (patch) | |
| tree | 57604c446361be99eb092f35e703445260ada84a /src/lib/film.cc | |
| parent | e34db1b3cdb5bce5ddcb112ee03664a4e463032a (diff) | |
Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.
Diffstat (limited to 'src/lib/film.cc')
| -rw-r--r-- | src/lib/film.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index 6764a5be6..0138211cf 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -38,7 +38,6 @@ #include "dcp_content_type.h" #include "ratio.h" #include "cross.h" -#include "safe_stringstream.h" #include "environment_info.h" #include "raw_convert.h" #include "audio_processor.h" @@ -52,6 +51,7 @@ #include "dcp_content.h" #include "screen_kdm.h" #include "cinema.h" +#include <locked_sstream.h> #include <libcxml/cxml.h> #include <dcp/cpl.h> #include <dcp/certificate_chain.h> @@ -197,7 +197,7 @@ Film::video_identifier () const { DCPOMATIC_ASSERT (container ()); - SafeStringStream s; + locked_stringstream s; s.imbue (std::locale::classic ()); s << container()->id() @@ -530,7 +530,7 @@ Film::mapped_audio_channels () const string Film::isdcf_name (bool if_created_now) const { - SafeStringStream d; + locked_stringstream d; string raw_name = name (); @@ -922,7 +922,7 @@ Film::j2c_path (int reel, Frame frame, Eyes eyes, bool tmp) const p /= "j2c"; p /= video_identifier (); - SafeStringStream s; + locked_stringstream s; s.width (8); s << setfill('0') << reel << "_" << frame; |