diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-08-29 11:56:22 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-08-29 11:58:18 +0100 |
| commit | 8b9b01ea76edb9fee8759b3aa88d43380e2db324 (patch) | |
| tree | bd7798783a93c62bfc12c7b25ac23c07196fadea /src | |
| parent | db25f209b87834e9f71f14897a55e1c554d13148 (diff) | |
Write annotation text and language to CCAP nodes correctly.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/reel_writer.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index 7b0233d21..9a600a739 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -335,7 +335,7 @@ ReelWriter::finish () } template <class T> -void +shared_ptr<T> maybe_add_text ( shared_ptr<dcp::SubtitleAsset> asset, int64_t picture_duration, @@ -419,6 +419,8 @@ maybe_add_text ( } reel->add (reel_asset); } + + return reel_asset; } shared_ptr<dcp::Reel> @@ -507,9 +509,13 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr } reel->add (reel_sound_asset); - maybe_add_text<dcp::ReelSubtitleAsset> (_subtitle_asset, reel_picture_asset->duration(), reel, refs, fonts, _film, _period); + maybe_add_text<dcp::ReelSubtitleAsset> (_subtitle_asset, reel_picture_asset->duration(), reel, refs, fonts, _film, _period); for (map<DCPTextTrack, shared_ptr<dcp::SubtitleAsset> >::const_iterator i = _closed_caption_assets.begin(); i != _closed_caption_assets.end(); ++i) { - maybe_add_text<dcp::ReelClosedCaptionAsset> (i->second, reel_picture_asset->duration(), reel, refs, fonts, _film, _period); + shared_ptr<dcp::ReelClosedCaptionAsset> a = maybe_add_text<dcp::ReelClosedCaptionAsset> ( + i->second, reel_picture_asset->duration(), reel, refs, fonts, _film, _period + ); + a->set_annotation_text (i->first.name); + a->set_language (i->first.language); } return reel; |