X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.h;h=f23bf0abe87980746b892def1244ff7241f38c0d;hb=79a871ea740509ff2fa540ca715375e0ba1c4ad9;hp=ea4676cecbe1607fe4a86e47a71c278e763e86b2;hpb=3a9bea8c3727af6ebbce860b8223371cd7f87b3f;p=dcpomatic.git

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index ea4676cec..f23bf0abe 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
@@ -96,6 +96,15 @@ public:
 		return _video_length;
 	}
 
+	VideoContent::Frame video_length_after_3d_combine () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		if (_video_frame_type == VIDEO_FRAME_TYPE_3D_ALTERNATE) {
+			return _video_length / 2;
+		}
+		
+		return _video_length;
+	}
+
 	libdcp::Size video_size () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _video_size;
@@ -162,6 +171,9 @@ public:
 
 	VideoContent::Frame time_to_content_video_frames (Time) const;
 
+	void scale_and_crop_to_fit_width ();
+	void scale_and_crop_to_fit_height ();
+
 protected:
 	void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);