Barely-functioning GL playback with new arrangement.

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

diff --git a/src/lib/video_mxf_decoder.h b/src/lib/video_mxf_decoder.h
index 34388ac82ce46d0d2e0ef89e3bab67b4e8037d0e..78313df0f332ec42ab06631f188ae737fe66ca3e 100644 (file)
--- a/src/lib/video_mxf_decoder.h
+++ b/src/lib/video_mxf_decoder.h
@@ -19,11 +19,8 @@
 */
 
 #include "decoder.h"
-
-namespace dcp {
-       class MonoPictureAssetReader;
-       class StereoPictureAssetReader;
-}
+#include <dcp/mono_picture_asset_reader.h>
+#include <dcp/stereo_picture_asset_reader.h>
 
 class VideoMXFContent;
 class Log;
@@ -31,15 +28,16 @@ class Log;
 class VideoMXFDecoder : public Decoder
 {
 public:
-       VideoMXFDecoder (boost::shared_ptr<const VideoMXFContent>, boost::shared_ptr<Log> log);
+       VideoMXFDecoder (boost::shared_ptr<const Film> film, boost::shared_ptr<const VideoMXFContent>);
+
+       bool pass ();
+       void seek (dcpomatic::ContentTime t, bool accurate);
 
 private:
-       bool pass (PassReason, bool accurate);
-       void seek (ContentTime t, bool accurate);
 
        boost::shared_ptr<const VideoMXFContent> _content;
        /** Time of next thing to return from pass */
-       ContentTime _next;
+       dcpomatic::ContentTime _next;
 
        boost::shared_ptr<dcp::MonoPictureAssetReader> _mono_reader;
        boost::shared_ptr<dcp::StereoPictureAssetReader> _stereo_reader;