Untested merge of master.

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index a52e5448a74ddda42327de7f1f6e8500543bc872..0b05b2f7143690237754d810d8557d8e80cb9d77 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -17,21 +17,21 @@
 
 */
 
-#ifndef DVDOMATIC_VIDEO_DECODER_H
-#define DVDOMATIC_VIDEO_DECODER_H
+#ifndef DCPOMATIC_VIDEO_DECODER_H
+#define DCPOMATIC_VIDEO_DECODER_H
 
 #include "video_source.h"
 #include "decoder.h"
 
 class VideoContent;
 
-class VideoDecoder : public VideoSource, public virtual Decoder
+class VideoDecoder : public TimedVideoSource, public virtual Decoder
 {
 public:
-       VideoDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<VideoContent>, DecodeOptions);
+       VideoDecoder (boost::shared_ptr<const Film>);
 
-       /** @return video frames per second, or 0 if unknown */
-       virtual float frames_per_second () const = 0;
+       /** @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 length according to our content's header */
@@ -48,28 +48,22 @@ public:
                return _video_frame;
        }
 
-       double last_source_time () const {
-               return _last_source_time;
+       double last_content_time () const {
+               return _last_content_time;
        }
 
 protected:
        
        virtual PixelFormat pixel_format () const = 0;
 
-       void emit_video (boost::shared_ptr<Image>, double);
+       void emit_video (boost::shared_ptr<Image>, bool, double);
        void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
-       void repeat_last_video ();
 
 private:
-       void signal_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>);
-
        int _video_frame;
-       double _last_source_time;
+       double _last_content_time;
        
        boost::shared_ptr<TimedSubtitle> _timed_subtitle;
-
-       boost::shared_ptr<Image> _last_image;
-       boost::shared_ptr<Subtitle> _last_subtitle;
 };
 
 #endif