From d645196b8d6fec1da6c69b28fa9ac2c445a58bd1 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 26 Nov 2015 11:15:02 +0000
Subject: Allow <Subtitle> nodes as the root of subtitles, not just <Font>

---
 src/interop_subtitle_asset.cc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/interop_subtitle_asset.cc')

diff --git a/src/interop_subtitle_asset.cc b/src/interop_subtitle_asset.cc
index 5777c31a..f450d360 100644
--- a/src/interop_subtitle_asset.cc
+++ b/src/interop_subtitle_asset.cc
@@ -58,7 +58,13 @@ InteropSubtitleAsset::InteropSubtitleAsset (boost::filesystem::path file)
 		font_nodes.push_back (shared_ptr<FontNode> (new FontNode (i, 250, "Id")));
 	}
 
-	parse_subtitles (xml, font_nodes);
+	f = xml->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, 250, "Id")));
+	}
+
+	parse_subtitles (xml, font_nodes, subtitle_nodes);
 }
 
 InteropSubtitleAsset::InteropSubtitleAsset ()
-- 
cgit v1.2.3