From: Carl Hetherington <cth@carlh.net>
Date: Tue, 21 May 2013 12:20:51 +0000 (+0100)
Subject: Merge branch 'sync-fixes' into staging
X-Git-Tag: v2.0.48~1337^2~347^2~1
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=5a57b5631518ce9711e6b44a65a0bb87aa434561;hp=-c;p=dcpomatic.git

Merge branch 'sync-fixes' into staging
---

5a57b5631518ce9711e6b44a65a0bb87aa434561
diff --combined src/lib/matcher.h
index 21e42f53d,d6778da11..61fd81436
--- a/src/lib/matcher.h
+++ b/src/lib/matcher.h
@@@ -19,6 -19,7 +19,6 @@@
  
  #include <boost/optional.hpp>
  #include "processor.h"
 -#include "ffmpeg_compatibility.h"
  
  class Matcher : public Processor, public TimedAudioSink, public TimedVideoSink, public AudioSource, public VideoSource 
  {
@@@ -29,7 -30,7 +29,7 @@@ public
  	void process_end ();
  
  private:
- 	void fix_start (double);
+ 	void fix_start ();
  	void match (double);
  	void repeat_last_video ();
  	
@@@ -41,6 -42,20 +41,20 @@@
  	boost::optional<libdcp::Size> _size;
  	boost::optional<int> _channels;
  
+ 	struct VideoRecord {
+ 		VideoRecord (boost::shared_ptr<const Image> i, bool s, boost::shared_ptr<Subtitle> u, double t)
+ 			: image (i)
+ 			, same (s)
+ 			, subtitle (u)
+ 			, time (t)
+ 		{}
+ 
+ 		boost::shared_ptr<const Image> image;
+ 		bool same;
+ 		boost::shared_ptr<Subtitle> subtitle;
+ 		double time;
+ 	};
+ 
  	struct AudioRecord {
  		AudioRecord (boost::shared_ptr<const AudioBuffers> a, double t)
  			: audio (a)
@@@ -51,6 -66,7 +65,7 @@@
  		double time;
  	};
  
+ 	std::list<VideoRecord> _pending_video;
  	std::list<AudioRecord> _pending_audio;
  
  	boost::optional<double> _first_input;