Various fixes.

1 files changed, 7 insertions, 6 deletions

diff --git a/src/dcp/subtitle.h b/src/dcp/subtitle.h
index f5d4002..8808dfb 100644
--- a/src/dcp/subtitle.h
+++ b/src/dcp/subtitle.h
@@ -39,17 +39,18 @@ class Subtitle
 {
 public:
 	Subtitle () {}
-	Subtitle (boost::shared_ptr<const cxml::Node> node, int tcr);
+	Subtitle (boost::shared_ptr<const cxml::Node> node, bool smpte);
 
-	FrameTime in;
-	FrameTime out;
-	FrameTime fade_up_time;
-	FrameTime fade_down_time;
+	TimePair in;
+	TimePair out;
+	TimePair fade_up_time;
+	TimePair fade_down_time;
 	std::list<boost::shared_ptr<Font> > font_nodes;
 	std::list<boost::shared_ptr<Text> > text_nodes;
 
 private:
-	FrameTime time (boost::shared_ptr<const cxml::Node>, std::string name, boost::optional<FrameTime> maximum = boost::optional<FrameTime> ());
+	boost::optional<FrameTime> smpte_time (boost::shared_ptr<const cxml::Node> node, std::string name);
+	boost::optional<MetricTime> interop_time (boost::shared_ptr<const cxml::Node> node, std::string name);
 };
 
 }