Remove another stringstream from DecryptedKDM.

[libdcp.git] / src / subtitle_node.cc

diff --git a/src/subtitle_node.cc b/src/subtitle_node.cc
index 41d1419be27342311190286e20a19904fabd5fcc..82c114012dca003739db9a272110bcc9612412ad 100644 (file)
--- a/src/subtitle_node.cc
+++ b/src/subtitle_node.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -15,6 +15,20 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 #include "subtitle_node.h"
@@ -31,19 +45,20 @@ using boost::shared_ptr;
 using boost::lexical_cast;
 using namespace dcp;
 
-SubtitleNode::SubtitleNode (boost::shared_ptr<const cxml::Node> node, int tcr, string font_id_attribute)
+/** @param tcr Timecode rate for SMPTE, or empty for Interop */
+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);
@@ -51,7 +66,7 @@ SubtitleNode::SubtitleNode (boost::shared_ptr<const cxml::Node> node, int tcr, s
 }
 
 Time
-SubtitleNode::fade_time (shared_ptr<const cxml::Node> node, string name, int tcr)
+SubtitleNode::fade_time (shared_ptr<const cxml::Node> node, string name, optional<int> tcr)
 {
        string const u = node->optional_string_attribute (name).get_value_or ("");
        Time t;
@@ -61,7 +76,7 @@ SubtitleNode::fade_time (shared_ptr<const cxml::Node> node, string name, int tcr
        } else if (u.find (":") != string::npos) {
                t = Time (u, tcr);
        } else {
-               t = Time (0, 0, 0, lexical_cast<int> (u), tcr);
+               t = Time (0, 0, 0, lexical_cast<int> (u), tcr.get_value_or(250));
        }
 
        if (t > Time (0, 0, 8, 0, 250)) {