Some more tidying up.

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 0b05b2f7143690237754d810d8557d8e80cb9d77..0f1432907fec5203f59ab54de62f5993786fbb6d 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -22,48 +22,36 @@
 
 #include "video_source.h"
 #include "decoder.h"
+#include "util.h"
 
 class VideoContent;
 
-class VideoDecoder : public TimedVideoSource, public virtual Decoder
+class VideoDecoder : public VideoSource, public virtual Decoder
 {
 public:
-       VideoDecoder (boost::shared_ptr<const Film>);
+       VideoDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const VideoContent>);
+
+       /* Calls for VideoContent to find out about itself */
 
        /** @return video frame rate second, or 0 if unknown */
        virtual float video_frame_rate () const = 0;
-       /** @return native size in pixels */
-       virtual libdcp::Size native_size () const = 0;
+       /** @return video size in pixels */
+       virtual libdcp::Size video_size () const = 0;
        /** @return length according to our content's header */
        virtual ContentVideoFrame video_length () const = 0;
 
-       virtual int time_base_numerator () const = 0;
-       virtual int time_base_denominator () const = 0;
-       virtual int sample_aspect_ratio_numerator () const = 0;
-       virtual int sample_aspect_ratio_denominator () const = 0;
-
-       void set_progress (Job *) const;
-       
-       int video_frame () const {
-               return _video_frame;
-       }
-
-       double last_content_time () const {
-               return _last_content_time;
-       }
-
 protected:
        
-       virtual PixelFormat pixel_format () const = 0;
+       void video (boost::shared_ptr<Image>, bool, Time);
+       void subtitle (boost::shared_ptr<TimedSubtitle>);
 
-       void emit_video (boost::shared_ptr<Image>, bool, double);
-       void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
+       Time _next_video;
 
 private:
-       int _video_frame;
-       double _last_content_time;
-       
+       boost::shared_ptr<const VideoContent> _video_content;
        boost::shared_ptr<TimedSubtitle> _timed_subtitle;
+       FrameRateConversion _frame_rate_conversion;
+       bool _odd;
 };
 
 #endif