Mostly-merge master.

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index b47d7fc3a3fb56909e9a120d216a9207e6b00571..c3228e88dac3fb2fcb633c32b752f8e7a8676f61 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -20,43 +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 VideoSource, public virtual Decoder
+class VideoDecoder : public virtual Decoder
 {
 public:
-       VideoDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const VideoContent>);
+       VideoDecoder (boost::shared_ptr<const VideoContent>);
 
-       virtual void seek (Time);
-       virtual void seek_back ();
-       virtual void seek_forward ();
-       
-       /* 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 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;
+       boost::shared_ptr<const VideoContent> video_content () const {
+               return _video_content;
+       }
 
 protected:
-       
-       void video (boost::shared_ptr<Image>, bool, Time);
-       void subtitle (boost::shared_ptr<TimedSubtitle>);
-       bool video_done () const;
 
-       Time _next_video;
+       void video (boost::shared_ptr<const Image>, bool, ContentTime);
        boost::shared_ptr<const VideoContent> _video_content;
-
-private:
-       boost::shared_ptr<TimedSubtitle> _timed_subtitle;
-       FrameRateConversion _frame_rate_conversion;
-       bool _odd;
 };
 
 #endif