summaryrefslogtreecommitdiff
path: root/src/subtitle_node.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-06-24 12:12:23 +0100
committerCarl Hetherington <cth@carlh.net>2016-06-24 12:12:23 +0100
commitdb536bd9f9f16b79286c5f0bb54d0f283050f7dd (patch)
treefafae4349032739326592dfaa18d6b499c743f6c /src/subtitle_node.cc
parenta5bf0e4edbdbf7a0818666313b1d3909986342f1 (diff)
Express standard differences in FontNode more neatly.
Diffstat (limited to 'src/subtitle_node.cc')
-rw-r--r--src/subtitle_node.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/subtitle_node.cc b/src/subtitle_node.cc
index 44c32e26..82c11401 100644
--- a/src/subtitle_node.cc
+++ b/src/subtitle_node.cc
@@ -46,19 +46,19 @@ using boost::lexical_cast;
using namespace dcp;
/** @param tcr Timecode rate for SMPTE, or empty for Interop */
-SubtitleNode::SubtitleNode (boost::shared_ptr<const cxml::Node> node, optional<int> tcr, string font_id_attribute)
+SubtitleNode::SubtitleNode (boost::shared_ptr<const cxml::Node> node, optional<int> tcr, Standard standard)
{
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_id_attribute)));
+ font_nodes.push_back (shared_ptr<FontNode> (new FontNode (*i, tcr, standard)));
}
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, font_id_attribute)));
+ text_nodes.push_back (shared_ptr<TextNode> (new TextNode (*i, tcr, standard)));
}
fade_up_time = fade_time (node, "FadeUpTime", tcr);