Merge master.

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 0b05b2f7143690237754d810d8557d8e80cb9d77..c3228e88dac3fb2fcb633c32b752f8e7a8676f61 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -20,50 +20,29 @@
 #ifndef DCPOMATIC_VIDEO_DECODER_H
 #define DCPOMATIC_VIDEO_DECODER_H
 
-#include "video_source.h"
+#include <boost/signals2.hpp>
+#include <boost/shared_ptr.hpp>
 #include "decoder.h"
+#include "video_content.h"
+#include "util.h"
+#include "decoded.h"
 
 class VideoContent;
+class Image;
 
-class VideoDecoder : public TimedVideoSource, public virtual Decoder
+class VideoDecoder : public virtual Decoder
 {
 public:
-       VideoDecoder (boost::shared_ptr<const Film>);
+       VideoDecoder (boost::shared_ptr<const VideoContent>);
 
-       /** @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 */
-       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;
+       boost::shared_ptr<const VideoContent> video_content () const {
+               return _video_content;
        }
 
 protected:
-       
-       virtual PixelFormat pixel_format () const = 0;
-
-       void emit_video (boost::shared_ptr<Image>, bool, double);
-       void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
 
-private:
-       int _video_frame;
-       double _last_content_time;
-       
-       boost::shared_ptr<TimedSubtitle> _timed_subtitle;
+       void video (boost::shared_ptr<const Image>, bool, ContentTime);
+       boost::shared_ptr<const VideoContent> _video_content;
 };
 
 #endif