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/subtitle_asset.h | |
| parent | ea629ead13e819b4ff5d5b5eba7b57520e8107e3 (diff) | |
Allow <Subtitle> nodes as the root of subtitles, not just <Font>
Diffstat (limited to 'src/subtitle_asset.h')
| -rw-r--r-- | src/subtitle_asset.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h index 8532d6a3..ebd6b745 100644 --- a/src/subtitle_asset.h +++ b/src/subtitle_asset.h @@ -84,7 +84,12 @@ protected: friend struct ::interop_dcp_font_test; friend struct ::smpte_dcp_font_test; - void parse_subtitles (boost::shared_ptr<cxml::Document> xml, std::list<boost::shared_ptr<FontNode> > font_nodes); + void parse_subtitles ( + boost::shared_ptr<cxml::Document> xml, + std::list<boost::shared_ptr<FontNode> > font_nodes, + std::list<boost::shared_ptr<SubtitleNode> > subtitle_nodes + ); + void subtitles_as_xml (xmlpp::Element* root, int time_code_rate, Standard standard) const; /** All our subtitles, in no particular order */ |