projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
dcp_subtitle_content.cc
diff --git
a/src/lib/dcp_subtitle_content.cc
b/src/lib/dcp_subtitle_content.cc
index e9998dd2a2eb10b1b6bd549169eddf80ed908fa6..83b0d200cee33146c6f92b33a1de1bd0b34df0da 100644
(file)
--- a/
src/lib/dcp_subtitle_content.cc
+++ b/
src/lib/dcp_subtitle_content.cc
@@
-24,6
+24,7
@@
#include "i18n.h"
using std::string;
#include "i18n.h"
using std::string;
+using std::list;
using boost::shared_ptr;
using dcp::raw_convert;
using boost::shared_ptr;
using dcp::raw_convert;
@@
-47,7
+48,7
@@
DCPSubtitleContent::examine (shared_ptr<Job> job)
{
Content::examine (job);
dcp::SubtitleContent sc (path (0), false);
{
Content::examine (job);
dcp::SubtitleContent sc (path (0), false);
- _length = DCPTime::from_
frames (sc.intrinsic_duration(), sc.edit_rate().as_float
());
+ _length = DCPTime::from_
seconds (sc.latest_subtitle_out().to_seconds
());
}
DCPTime
}
DCPTime