diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-11-26 11:15:02 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-11-26 11:15:02 +0000 |
| commit | d645196b8d6fec1da6c69b28fa9ac2c445a58bd1 (patch) | |
| tree | d430b0a1d85309c28f46c384cbe8b08e9c3c123b /src/smpte_subtitle_asset.cc | |
| parent | ea629ead13e819b4ff5d5b5eba7b57520e8107e3 (diff) | |
Allow <Subtitle> nodes as the root of subtitles, not just <Font>
Diffstat (limited to 'src/smpte_subtitle_asset.cc')
| -rw-r--r-- | src/smpte_subtitle_asset.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/smpte_subtitle_asset.cc b/src/smpte_subtitle_asset.cc index 070ade73..165e88e3 100644 --- a/src/smpte_subtitle_asset.cc +++ b/src/smpte_subtitle_asset.cc @@ -124,7 +124,13 @@ SMPTESubtitleAsset::SMPTESubtitleAsset (boost::filesystem::path file) font_nodes.push_back (shared_ptr<FontNode> (new FontNode (i, _time_code_rate, "ID"))); } - parse_subtitles (xml, font_nodes); + f = subtitle_list->node_children ("Subtitle"); + list<shared_ptr<dcp::SubtitleNode> > subtitle_nodes; + BOOST_FOREACH (cxml::NodePtr& i, f) { + subtitle_nodes.push_back (shared_ptr<SubtitleNode> (new SubtitleNode (i, _time_code_rate, "ID"))); + } + + parse_subtitles (xml, font_nodes, subtitle_nodes); if (reader) { ASDCP::TimedText::TimedTextDescriptor descriptor; |