Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0

[libdcp.git] / src / subtitle.h

diff --git a/src/subtitle.h b/src/subtitle.h
index 073bfb0c04255bca33e44d33d8982dbcace32db5..0958a1d4d96b7a876d2e25f4afd3d99ada6b8f27 100644 (file)
--- a/src/subtitle.h
+++ b/src/subtitle.h
@@ -22,6 +22,7 @@
 
 #include "dcp_time.h"
 #include <boost/shared_ptr.hpp>
+#include <boost/optional.hpp>
 #include <list>
 
 namespace cxml {
@@ -37,7 +38,7 @@ class Subtitle
 {
 public:
        Subtitle () {}
-       Subtitle (boost::shared_ptr<const cxml::Node> node);
+       Subtitle (boost::shared_ptr<const cxml::Node> node, int tcr);
 
        Time in;
        Time out;
@@ -47,7 +48,7 @@ public:
        std::list<boost::shared_ptr<Text> > text_nodes;
 
 private:
-       Time fade_time (boost::shared_ptr<const cxml::Node>, std::string name);
+       Time fade_time (boost::shared_ptr<const cxml::Node>, std::string name, int tcr);
 };
 
 }