summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-05-07 00:14:49 +0100
committerCarl Hetherington <cth@carlh.net>2015-05-07 00:14:49 +0100
commit33de7ebf55a3059fa0f444c4b06ac00ad37cb5ae (patch)
tree4b63128e3340af2aa452f52950377cf316660843 /src
parent4a4cb9f65fef738b59441e12eb002a5711a7d3ab (diff)
Fix writing of LoadFont tags in subtitles.
Diffstat (limited to 'src')
-rw-r--r--src/lib/writer.cc24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 569953641..d2116362e 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -505,18 +505,6 @@ 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,
- dcp::Fraction (_film->video_frame_rate(), 1),
- _picture_mxf->intrinsic_duration (),
- 0
- )
- ));
-
- dcp.add (_subtitle_content);
-
boost::filesystem::path const liberation = shared_path () / "LiberationSans-Regular.ttf";
/* Add all the fonts to the subtitle content and as assets to the DCP */
@@ -534,6 +522,18 @@ Writer::finish ()
LOG_WARNING_NC (String::compose ("Could not copy font %1 to DCP", from.string ()));
}
}
+
+ _subtitle_content->write_xml (_film->dir (_film->dcp_name ()) / _film->subtitle_xml_filename ());
+ reel->add (shared_ptr<dcp::ReelSubtitleAsset> (
+ new dcp::ReelSubtitleAsset (
+ _subtitle_content,
+ dcp::Fraction (_film->video_frame_rate(), 1),
+ _picture_mxf->intrinsic_duration (),
+ 0
+ )
+ ));
+
+ dcp.add (_subtitle_content);
}
cpl->add (reel);