Fix another bit of incorrect logic (this_is_first_audio was inverted). Also try...

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

diff --git a/src/lib/matcher.h b/src/lib/matcher.h
index 2f580b589f7060b01ced9230dcdbcd459cea189d..aab6adad96c7a863efd45dc2afd63f8beb42182d 100644 (file)
--- a/src/lib/matcher.h
+++ b/src/lib/matcher.h
@@ -21,16 +21,19 @@
 #include "processor.h"
 #include "ffmpeg_compatibility.h"
 
-class Matcher : public Processor, public TimedVideoSink, public TimedAudioSink, public VideoSource, public AudioSource
+class Matcher : public Processor, public TimedAudioSink, public TimedVideoSink, public AudioSource, public VideoSource 
 {
 public:
-       Matcher (Log* log, int sample_rate, float frames_per_second);
-       void process_video (boost::shared_ptr<Image> i, bool, boost::shared_ptr<Subtitle> s, double t);
-       void process_audio (boost::shared_ptr<AudioBuffers>, double t);
+       Matcher (boost::shared_ptr<Log> log, int sample_rate, float frames_per_second);
+
+       void set_audio_starts_with_video (bool);
+       
+       void process_video (boost::shared_ptr<const Image> i, bool, boost::shared_ptr<Subtitle> s, double);
+       void process_audio (boost::shared_ptr<const AudioBuffers>, double);
        void process_end ();
 
 private:
-       void fix_start ();
+       void fix_start (double);
        void match (double);
        void repeat_last_video ();
        
@@ -42,35 +45,25 @@ private:
        boost::optional<libdcp::Size> _size;
        boost::optional<int> _channels;
 
-       struct VideoRecord {
-               VideoRecord (boost::shared_ptr<Image> i, bool s, boost::shared_ptr<Subtitle> sub, double t)
-                       : image (i)
-                       , same (s)
-                       , subtitle (sub)
-                       , time (t)
-               {}
-               
-               boost::shared_ptr<Image> image;
-               bool same;
-               boost::shared_ptr<Subtitle> subtitle;
-               double time;
-       };
-
-       std::list<VideoRecord> _pending_video;
-
        struct AudioRecord {
-               AudioRecord (boost::shared_ptr<AudioBuffers> a, double t)
+               AudioRecord (boost::shared_ptr<const AudioBuffers> a, double t)
                        : audio (a)
                        , time (t)
                {}
                
-               boost::shared_ptr<AudioBuffers> audio;
+               boost::shared_ptr<const AudioBuffers> audio;
                double time;
        };
 
        std::list<AudioRecord> _pending_audio;
 
        boost::optional<double> _first_input;
-       boost::shared_ptr<Image> _last_image;
+       boost::optional<double> _first_video;
+       boost::shared_ptr<const Image> _last_image;
        boost::shared_ptr<Subtitle> _last_subtitle;
+
+       bool _had_first_video;
+       bool _had_first_audio;
+
+       bool _audio_starts_with_video;
 };