diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-10 16:15:13 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-10 16:15:13 +0100 |
| commit | 8c6e4c8e4f37450f44cb4ca9918406a6f2cc6055 (patch) | |
| tree | 3b77e87348a5048713520b65e306b25f040494c0 /src/lib/writer.cc | |
| parent | 38164bf6e8095f8a8f852bd21877cfb90d204868 (diff) | |
Various fixes for DCP subtitles, and a test or two.
Diffstat (limited to 'src/lib/writer.cc')
| -rw-r--r-- | src/lib/writer.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/writer.cc b/src/lib/writer.cc index b1dbca0e0..09dd6322e 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -456,7 +456,15 @@ Writer::finish () if (_subtitle_content) { _subtitle_content->write_xml (_film->dir (_film->dcp_name ()) / _film->subtitle_xml_filename ()); - reel->add (shared_ptr<dcp::ReelSubtitleAsset> (new dcp::ReelSubtitleAsset (_subtitle_content, 0))); + reel->add (shared_ptr<dcp::ReelSubtitleAsset> ( + new dcp::ReelSubtitleAsset ( + _subtitle_content, + dcp::Fraction (_film->video_frame_rate(), 1), + _subtitle_content->latest_subtitle_out().to_seconds() * _film->video_frame_rate(), + 0 + ) + )); + dcp.add (_subtitle_content); } @@ -583,7 +591,7 @@ Writer::write (PlayerSubtitles subs) { if (!_subtitle_content) { _subtitle_content.reset ( - new dcp::SubtitleContent (dcp::Fraction (_film->video_frame_rate(), 1), _film->name(), _film->isdcf_metadata().subtitle_language) + new dcp::SubtitleContent (_film->name(), _film->isdcf_metadata().subtitle_language) ); } |