Fix thinko in video signalling.

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

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 1807254dbc1c57a35154ad3a136b72bcd0ff4398..805f6e521326bd9902f8b6bcace5495f7335fdcb 100644 (file)
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -31,6 +31,8 @@
 #include <boost/signals2.hpp>
 #include "util.h"
 #include "stream.h"
+#include "video_source.h"
+#include "audio_source.h"
 
 class Job;
 class Options;
@@ -49,11 +51,11 @@ class FilterGraph;
  *  (by calling ::go), and they emit signals when video or audio data is ready for something else
  *  to process.
  */
-class Decoder
+class Decoder : public VideoSource, public AudioSource
 {
 public:
        Decoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *);
-       virtual ~Decoder ();
+       virtual ~Decoder () {}
 
        /* Methods to query our input video */
 
@@ -61,52 +63,44 @@ public:
        virtual float frames_per_second () const = 0;
        /** @return native size in pixels */
        virtual Size native_size () const = 0;
-       /** @return number of audio channels */
-       virtual int audio_channels () const = 0;
-       /** @return audio sampling rate in Hz */
-       virtual int audio_sample_rate () const = 0;
-       virtual int64_t audio_channel_layout () const = 0;
-       virtual bool has_subtitles () 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 process_begin ();
        virtual bool pass () = 0;
-       void process_end ();
        void go ();
 
        SourceFrame video_frame () const {
                return _video_frame;
        }
 
-       virtual std::vector<AudioStream> audio_streams () const {
-               return std::vector<AudioStream> ();
-       }
-       
-       virtual std::vector<SubtitleStream> subtitle_streams () const {
-               return std::vector<SubtitleStream> ();
+       virtual void set_audio_stream (boost::optional<AudioStream>);
+       virtual void set_subtitle_stream (boost::optional<SubtitleStream>);
+
+       boost::optional<AudioStream> audio_stream () const {
+               return _audio_stream;
        }
 
-       /** Emitted when a video frame is ready.
-        *  First parameter is the frame within the source.
-        *  Second parameter is its index within the content.
-        *  Third parameter is either 0 or a subtitle that should be on this frame.
-        */
-       boost::signals2::signal<void (boost::shared_ptr<Image>, SourceFrame, boost::shared_ptr<Subtitle>)> Video;
+       boost::optional<SubtitleStream> subtitle_stream () const {
+               return _subtitle_stream;
+       }
 
-       /** Emitted when some audio data is ready */
-       boost::signals2::signal<void (boost::shared_ptr<AudioBuffers>, int64_t)> Audio;
+       std::vector<AudioStream> audio_streams () const {
+               return _audio_streams;
+       }
+       
+       std::vector<SubtitleStream> subtitle_streams () const {
+               return _subtitle_streams;
+       }
 
 protected:
        
        virtual PixelFormat pixel_format () const = 0;
        
-       void process_video (AVFrame *);
-       void process_audio (boost::shared_ptr<AudioBuffers>);
-       void process_subtitle (boost::shared_ptr<TimedSubtitle>);
+       void emit_video (boost::shared_ptr<Image>);
+       void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
        void repeat_last_video ();
 
        /** our Film */
@@ -116,17 +110,16 @@ protected:
        /** associated Job, or 0 */
        Job* _job;
 
-private:
-       void emit_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>);
-       void emit_audio (boost::shared_ptr<AudioBuffers>);
+       boost::optional<AudioStream> _audio_stream;
+       boost::optional<SubtitleStream> _subtitle_stream;
 
-       SourceFrame _video_frame;
-       int64_t _audio_frame;
+       std::vector<AudioStream> _audio_streams;
+       std::vector<SubtitleStream> _subtitle_streams;
        
-       std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
+private:
+       void signal_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>);
 
-       DelayLine* _delay_line;
-       int _delay_in_frames;
+       SourceFrame _video_frame;
 
        boost::shared_ptr<TimedSubtitle> _timed_subtitle;