X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.h;h=6b91997c9f4076c91ffdd9d536ee21106bc0e9d0;hb=854f2e5bbb7ffb9758b823af87034033033f3cb8;hp=d2b19480f056f1895ab722d1ee50a96ee1989d37;hpb=1f8b45c7fd49714628009f5ed2161fbaa2b4d729;p=dcpomatic.git

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index d2b19480f..6b91997c9 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;
 	}
 
+	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;