Allow <Subtitle> nodes as the root of subtitles, not just <Font>

1 files changed, 6 insertions, 1 deletions

diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc
index 414825a4..3dcc9ad6 100644
--- a/src/subtitle_asset.cc
+++ b/src/subtitle_asset.cc
@@ -59,11 +59,16 @@ SubtitleAsset::SubtitleAsset (boost::filesystem::path file)
 }
 
 void
-SubtitleAsset::parse_subtitles (shared_ptr<cxml::Document> xml, list<shared_ptr<dcp::FontNode> > font_nodes)
+SubtitleAsset::parse_subtitles (
+	shared_ptr<cxml::Document> xml,
+	list<shared_ptr<dcp::FontNode> > font_nodes,
+	list<shared_ptr<dcp::SubtitleNode> > subtitle_nodes
+	)
 {
 	/* Make Subtitle objects to represent the raw XML nodes in a sane way */
 	ParseState parse_state;
 	examine_font_nodes (xml, font_nodes, parse_state);
+	examine_subtitle_nodes (xml, subtitle_nodes, parse_state);
 }
 
 void