Some missing copy constructors / operator= / noncopyable.

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index df06b7cd9ffa3bb5ca7bd6ab4783ca055ad4c50f..0560cbb6f18e6dfcaada224413f018f5ddcc4483 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -1,60 +1,51 @@
-#ifndef DVDOMATIC_VIDEO_DECODER_H
-#define DVDOMATIC_VIDEO_DECODER_H
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
 
-#include "video_source.h"
-#include "stream.h"
-#include "decoder.h"
-
-class VideoDecoder : public VideoSource, public virtual Decoder
-{
-public:
-       VideoDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *);
+    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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
 
-       /** @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;
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
-       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;
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-       virtual void set_subtitle_stream (boost::optional<SubtitleStream>);
+*/
 
-       SourceFrame video_frame () const {
-               return _video_frame;
-       }
+#ifndef DCPOMATIC_VIDEO_DECODER_H
+#define DCPOMATIC_VIDEO_DECODER_H
 
-       boost::optional<SubtitleStream> subtitle_stream () const {
-               return _subtitle_stream;
-       }
+#include "decoder.h"
+#include "util.h"
 
-       std::vector<SubtitleStream> subtitle_streams () const {
-               return _subtitle_streams;
-       }
+class VideoContent;
 
-protected:
+class VideoDecoder : public virtual Decoder
+{
+public:
+       VideoDecoder (boost::shared_ptr<const Film>);
+
+       /** Seek so that the next pass() will yield (approximately) the requested frame.
+        *  Pass accurate = true to try harder to get close to the request.
+        */
+       virtual void seek (VideoContent::Frame frame, bool accurate) = 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;
        
-       virtual PixelFormat pixel_format () const = 0;
-       void set_progress () const;
-
-       void emit_video (boost::shared_ptr<Image>);
-       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;
-
-       boost::shared_ptr<TimedSubtitle> _timed_subtitle;
+protected:
 
-       boost::shared_ptr<Image> _last_image;
-       boost::shared_ptr<Subtitle> _last_subtitle;
+       void video (boost::shared_ptr<const Image>, bool, VideoContent::Frame);
+       VideoContent::Frame _video_position;
 };
 
 #endif