Various small fixes.

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index c86248417bdd8b4f8147fd149fb6fbe3279e2775..86a9489b111338241dc5907cb7d8f9ad0e685229 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,30 +20,35 @@
 #ifndef DCPOMATIC_VIDEO_DECODER_H
 #define DCPOMATIC_VIDEO_DECODER_H
 
+#include <boost/signals2.hpp>
+#include <boost/shared_ptr.hpp>
 #include "decoder.h"
+#include "video_content.h"
 #include "util.h"
+#include "content_video.h"
 
 class VideoContent;
+class Image;
 
 class VideoDecoder : public virtual Decoder
 {
 public:
-       VideoDecoder (boost::shared_ptr<const Film>);
-
-       virtual void seek (VideoContent::Frame) = 0;
-       virtual void seek_back () = 0;
-
-       /** Emitted when a video frame is ready.
-        *  First parameter is the video image.
-        *  Second parameter is true if the image is the same as the last one that was emitted.
-        *  Third parameter is the frame within our source.
-        */
-       boost::signals2::signal<void (boost::shared_ptr<const Image>, bool, VideoContent::Frame)> Video;
-       
+       VideoDecoder (boost::shared_ptr<const VideoContent> c);
+
+       boost::optional<ContentVideo> get_video (VideoFrame frame, bool accurate);
+
+       boost::shared_ptr<const VideoContent> video_content () const {
+               return _video_content;
+       }
+
 protected:
 
-       void video (boost::shared_ptr<const Image>, bool, VideoContent::Frame);
-       VideoContent::Frame _next_video_frame;
+       void seek (ContentTime time, bool accurate);
+       void video (boost::shared_ptr<const Image>, VideoFrame frame);
+       boost::optional<ContentVideo> decoded_video (VideoFrame frame);
+
+       boost::shared_ptr<const VideoContent> _video_content;
+       std::list<ContentVideo> _decoded_video;
 };
 
 #endif