Merge branch 'master' into content-rework-take5

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index b2b3994322abec5f8a96ec684fe8b0f20db66d61..a2fd5b6510a1fb297c555cf49ce749772e998d21 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -21,55 +21,51 @@
 #define DVDOMATIC_VIDEO_DECODER_H
 
 #include "video_source.h"
-#include "stream.h"
 #include "decoder.h"
 
+class VideoContent;
+
 class VideoDecoder : public VideoSource, public virtual Decoder
 {
 public:
-       VideoDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *);
+       VideoDecoder (boost::shared_ptr<const Film>);
 
        /** @return video frames per second, or 0 if unknown */
        virtual float frames_per_second () const = 0;
        /** @return native size in pixels */
-       virtual Size native_size () const = 0;
+       virtual libdcp::Size native_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;
 
-       virtual void set_subtitle_stream (boost::optional<SubtitleStream>);
-
-       SourceFrame video_frame () const {
+       void set_progress (Job *) const;
+       
+       int video_frame () const {
                return _video_frame;
        }
 
-       boost::optional<SubtitleStream> subtitle_stream () const {
-               return _subtitle_stream;
-       }
-
-       std::vector<SubtitleStream> subtitle_streams () const {
-               return _subtitle_streams;
+       double last_source_time () const {
+               return _last_source_time;
        }
 
 protected:
        
        virtual PixelFormat pixel_format () const = 0;
-       void set_progress () const;
 
-       void emit_video (boost::shared_ptr<Image>);
+       void emit_video (boost::shared_ptr<Image>, double);
        void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
        void repeat_last_video ();
 
-       boost::optional<SubtitleStream> _subtitle_stream;
-       std::vector<SubtitleStream> _subtitle_streams;
-
 private:
-       void signal_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>);
-
-       SourceFrame _video_frame;
+       void signal_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>);
 
+       int _video_frame;
+       double _last_source_time;
+       
        boost::shared_ptr<TimedSubtitle> _timed_subtitle;
 
        boost::shared_ptr<Image> _last_image;