X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftypes.h;h=f554c4dd9ad1f72dc0094fb625eed35c116e0aad;hb=3f3727634b98ce2761a193b9d1e3fc14f51dcbd2;hp=9a6a30b861d45344325507186f5c08b2b200ea42;hpb=6de35d058821acc092d2aae75543024a97026b8a;p=dcpomatic.git diff --git a/src/lib/types.h b/src/lib/types.h index 9a6a30b86..f554c4dd9 100644 --- a/src/lib/types.h +++ b/src/lib/types.h @@ -20,12 +20,12 @@ #ifndef DCPOMATIC_TYPES_H #define DCPOMATIC_TYPES_H -#include -#include -#include -#include #include "dcpomatic_time.h" #include "position.h" +#include +#include +#include +#include class Content; class VideoContent; @@ -57,22 +57,6 @@ typedef std::vector > FFmpegContentList; typedef int64_t VideoFrame; typedef int64_t AudioFrame; -/* XXX -> DCPAudio */ -struct TimedAudioBuffers -{ - TimedAudioBuffers () - : time (0) - {} - - TimedAudioBuffers (boost::shared_ptr a, DCPTime t) - : audio (a) - , time (t) - {} - - boost::shared_ptr audio; - DCPTime time; -}; - enum VideoFrameType { VIDEO_FRAME_TYPE_2D,