X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftypes.h;h=4e1f59ca87fb122baea9acad6c63b71f5e83061d;hb=e6f28e7cda23c1ba3c49cc1bf2dc1491c2f87160;hp=42344cae543b8d380a5ccdc275b53816c4e79a69;hpb=a79d78d8bb6d51f6662f1f63b9f8fd19e1a0c5f1;p=dcpomatic.git diff --git a/src/lib/types.h b/src/lib/types.h index 42344cae5..4e1f59ca8 100644 --- a/src/lib/types.h +++ b/src/lib/types.h @@ -24,6 +24,7 @@ #include #include #include +#include "dcpomatic_time.h" class Content; class VideoContent; @@ -44,27 +45,27 @@ typedef std::vector > AudioContentList; typedef std::vector > SubtitleContentList; typedef std::vector > FFmpegContentList; -template struct TimedAudioBuffers { TimedAudioBuffers () : time (0) {} - TimedAudioBuffers (boost::shared_ptr a, T t) + TimedAudioBuffers (boost::shared_ptr a, DCPTime t) : audio (a) , time (t) {} boost::shared_ptr audio; - T time; + DCPTime time; }; enum VideoFrameType { VIDEO_FRAME_TYPE_2D, VIDEO_FRAME_TYPE_3D_LEFT_RIGHT, - VIDEO_FRAME_TYPE_3D_TOP_BOTTOM + VIDEO_FRAME_TYPE_3D_TOP_BOTTOM, + VIDEO_FRAME_TYPE_3D_ALTERNATE }; enum Eyes