X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_content.cc;h=9e767596cf7619e34ae6673a53d21c054036496a;hp=431492c7ac29b8b50091d75e1cdbfead4d5e3dac;hb=73654117144c6de0ec4efe39ddc88485df546cc9;hpb=422be0eece2bf6ee80db1d3c21553cd82efff789 diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index 431492c7a..9e767596c 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -50,6 +50,7 @@ using boost::shared_ptr; using boost::scoped_ptr; using boost::optional; using boost::function; +using dcp::raw_convert; int const DCPContentProperty::CAN_BE_PLAYED = 600; int const DCPContentProperty::REFERENCE_VIDEO = 601; @@ -239,14 +240,13 @@ DCPContent::full_length () const string DCPContent::identifier () const { - locked_stringstream s; - s << Content::identifier() << "_" << video->identifier() << "_"; + string s = Content::identifier() + "_" + video->identifier() + "_"; if (subtitle) { - s << subtitle->identifier () << " "; + s += subtitle->identifier () + " "; } - s << (_reference_video ? "1" : "0") - << (_reference_subtitle ? "1" : "0"); - return s.str (); + + s += string (_reference_video ? "1" : "0") + string (_reference_subtitle ? "1" : "0"); + return s; } void