Mostly-merge master.

[dcpomatic.git] / src / lib / video_content.h

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index d2b19480f056f1895ab722d1ee50a96ee1989d37..eeb49cfa543a3ed4a746ae7c01093d7e65eb6f79 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -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;