projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Apply FFmpeg palette fix to examination too; fix build with old FFmpeg.
[dcpomatic.git]
/
src
/
lib
/
string_text_file_content.cc
diff --git
a/src/lib/string_text_file_content.cc
b/src/lib/string_text_file_content.cc
index b4362a7d0e7bb9e4b40ef97e6b7f779170ff991a..9a25ef06f00ce6e10532721b88183a9d0ed46d9a 100644
(file)
--- a/
src/lib/string_text_file_content.cc
+++ b/
src/lib/string_text_file_content.cc
@@
-35,6
+35,7
@@
using std::cout;
using boost::shared_ptr;
using boost::optional;
using dcp::raw_convert;
using boost::shared_ptr;
using boost::optional;
using dcp::raw_convert;
+using namespace dcpomatic;
StringTextFileContent::StringTextFileContent (boost::filesystem::path path)
: Content (path)
StringTextFileContent::StringTextFileContent (boost::filesystem::path path)
: Content (path)
@@
-100,3
+101,11
@@
StringTextFileContent::approximate_length () const
{
return DCPTime (_length, FrameRateChange());
}
{
return DCPTime (_length, FrameRateChange());
}
+
+string
+StringTextFileContent::identifier () const
+{
+ string s = Content::identifier ();
+ s += "_" + only_text()->identifier();
+ return s;
+}