More stringstream removal.

[libdcp.git] / src / subtitle_node.h

diff --git a/src/subtitle_node.h b/src/subtitle_node.h
index d615557a6b1b334333719cddd1eaf82540a53cd2..e08ecfd422194a531e6b350a724d6dcfae90bd18 100644 (file)
--- a/src/subtitle_node.h
+++ b/src/subtitle_node.h
@@ -1,20 +1,34 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    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.
 */
 
 #ifndef LIBDCP_SUBTITLE_NODE_H
@@ -31,14 +45,14 @@ namespace cxml {
 
 namespace dcp {
 
-class FontNode;        
+class FontNode;
 class TextNode;
 
 class SubtitleNode
 {
 public:
        SubtitleNode () {}
-       SubtitleNode (boost::shared_ptr<const cxml::Node> node, int tcr);
+       SubtitleNode (boost::shared_ptr<const cxml::Node> node, boost::optional<int> tcr, Standard standard);
 
        Time in;
        Time out;
@@ -48,7 +62,7 @@ public:
        std::list<boost::shared_ptr<TextNode> > text_nodes;
 
 private:
-       Time fade_time (boost::shared_ptr<const cxml::Node>, std::string name, int tcr);
+       Time fade_time (boost::shared_ptr<const cxml::Node>, std::string name, boost::optional<int> tcr);
 };
 
 }