diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-10-29 19:33:09 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-10-29 19:33:09 +0000 |
| commit | 914bd98baa57c6f2c117e33b21a9ee3d25d0fdc2 (patch) | |
| tree | 1a1c540c723566d5c009c4df210195e32e1d833f /src/subtitle_node.cc | |
| parent | 6dc0cdbd5be3f8f60bd50523501a0bd85666ebda (diff) | |
Pick up SMPTE subtitle font IDs correctly.
Diffstat (limited to 'src/subtitle_node.cc')
| -rw-r--r-- | src/subtitle_node.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/subtitle_node.cc b/src/subtitle_node.cc index f53878b6..e221b43b 100644 --- a/src/subtitle_node.cc +++ b/src/subtitle_node.cc @@ -31,19 +31,19 @@ using boost::shared_ptr; using boost::lexical_cast; using namespace dcp; -SubtitleNode::SubtitleNode (boost::shared_ptr<const cxml::Node> node, int tcr) +SubtitleNode::SubtitleNode (boost::shared_ptr<const cxml::Node> node, int tcr, string font_id_attribute) { in = Time (node->string_attribute ("TimeIn"), tcr); out = Time (node->string_attribute ("TimeOut"), tcr); list<cxml::NodePtr> f = node->node_children ("Font"); for (list<cxml::NodePtr>::iterator i = f.begin(); i != f.end(); ++i) { - font_nodes.push_back (shared_ptr<FontNode> (new FontNode (*i, tcr))); + font_nodes.push_back (shared_ptr<FontNode> (new FontNode (*i, tcr, font_id_attribute))); } list<cxml::NodePtr> t = node->node_children ("Text"); for (list<cxml::NodePtr>::iterator i = t.begin(); i != t.end(); ++i) { - text_nodes.push_back (shared_ptr<TextNode> (new TextNode (*i, tcr))); + text_nodes.push_back (shared_ptr<TextNode> (new TextNode (*i, tcr, font_id_attribute))); } fade_up_time = fade_time (node, "FadeUpTime", tcr); |
