X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.h;h=8313c73eeb8a32b8d65a79e2caa6d22466966042;hb=bb0a36c3a6bea9cd1ebdde7b8a3a04765e317569;hp=c98a52d3a7cc17c842ddcde6634cf7951d362541;hpb=3753cb8685e1755b067676345a5871db24149d0f;p=dcpomatic.git

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index c98a52d3a..8313c73ee 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -43,9 +43,9 @@ public:
 	VideoContentScale ();
 	VideoContentScale (Ratio const *);
 	VideoContentScale (bool);
-	VideoContentScale (boost::shared_ptr<cxml::Node>);
+	VideoContentScale (cxml::NodePtr);
 
-	libdcp::Size size (boost::shared_ptr<const VideoContent>, libdcp::Size) const;
+	dcp::Size size (boost::shared_ptr<const VideoContent>, dcp::Size, dcp::Size) const;
 	std::string id () const;
 	std::string name () const;
 	void as_xml (xmlpp::Node *) const;
@@ -64,7 +64,9 @@ public:
 	}
 
 private:
+	/** a ratio to stretch the content to, or 0 for no stretch */
 	Ratio const * _ratio;
+	/** true if we want to scale the content */
 	bool _scale;
 
 	static std::vector<VideoContentScale> _scales;
@@ -79,9 +81,9 @@ public:
 	typedef int Frame;
 
 	VideoContent (boost::shared_ptr<const Film>);
-	VideoContent (boost::shared_ptr<const Film>, Time, VideoContent::Frame);
+	VideoContent (boost::shared_ptr<const Film>, DCPTime, ContentTime);
 	VideoContent (boost::shared_ptr<const Film>, boost::filesystem::path);
-	VideoContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>, int);
+	VideoContent (boost::shared_ptr<const Film>, cxml::ConstNodePtr, int);
 	VideoContent (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
 
 	void as_xml (xmlpp::Node *) const;
@@ -89,12 +91,21 @@ public:
 	virtual std::string information () const;
 	virtual std::string identifier () const;
 
-	VideoContent::Frame video_length () const {
+	ContentTime video_length () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _video_length;
 	}
 
-	libdcp::Size video_size () const {
+	ContentTime video_length_after_3d_combine () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		if (_video_frame_type == VIDEO_FRAME_TYPE_3D_ALTERNATE) {
+			return ContentTime (_video_length.get() / 2);
+		}
+		
+		return _video_length;
+	}
+
+	dcp::Size video_size () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _video_size;
 	}
@@ -155,15 +166,15 @@ public:
 		return _colour_conversion;
 	}
 
-	libdcp::Size video_size_after_3d_split () const;
-	libdcp::Size video_size_after_crop () const;
+	dcp::Size video_size_after_3d_split () const;
+	dcp::Size video_size_after_crop () const;
 
-	VideoContent::Frame time_to_content_video_frames (Time) const;
+	ContentTime dcp_time_to_content_time (DCPTime) const;
 
 protected:
 	void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
 
-	VideoContent::Frame _video_length;
+	ContentTime _video_length;
 	float _video_frame_rate;
 
 private:
@@ -174,7 +185,7 @@ private:
 
 	void setup_default_colour_conversion ();
 	
-	libdcp::Size _video_size;
+	dcp::Size _video_size;
 	VideoFrameType _video_frame_type;
 	Crop _crop;
 	VideoContentScale _scale;