projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move raw_convert into libdcp.
[dcpomatic.git]
/
src
/
lib
/
dcp_content.cc
diff --git
a/src/lib/dcp_content.cc
b/src/lib/dcp_content.cc
index 431492c7ac29b8b50091d75e1cdbfead4d5e3dac..9e767596cf7619e34ae6673a53d21c054036496a 100644
(file)
--- 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 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;
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
{
string
DCPContent::identifier () const
{
- locked_stringstream s;
- s << Content::identifier() << "_" << video->identifier() << "_";
+ string s = Content::identifier() + "_" + video->identifier() + "_";
if (subtitle) {
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
}
void