X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Faudio_merger.cc;h=a16c378c67309dac758c90abd27fc275ef7db769;hb=6e6ebf3122333b38333482bce64df3e6e61e64c4;hp=8a69dee5204036381253a4f23e54ba12892587e6;hpb=9979f8f81258cecae06c8254868eceac43c56f8e;p=dcpomatic.git

diff --git a/src/lib/audio_merger.cc b/src/lib/audio_merger.cc
index 8a69dee52..a16c378c6 100644
--- a/src/lib/audio_merger.cc
+++ b/src/lib/audio_merger.cc
@@ -56,11 +56,9 @@ AudioMerger::pull (DCPTime time)
 {
 	list<pair<shared_ptr<AudioBuffers>, DCPTime> > out;
 
-	DCPTimePeriod period (_last_pull, time);
-	_buffers.sort (AudioMerger::BufferComparator());
-
 	list<Buffer> new_buffers;
 
+	_buffers.sort (AudioMerger::BufferComparator());
 	BOOST_FOREACH (Buffer i, _buffers) {
 		if (i.period().to <= time) {
 			/* Completely within the pull period */
@@ -98,7 +96,6 @@ AudioMerger::pull (DCPTime time)
 void
 AudioMerger::push (boost::shared_ptr<const AudioBuffers> audio, DCPTime time)
 {
-	DCPOMATIC_ASSERT (time >= _last_pull);
 	DCPOMATIC_ASSERT (audio->frames() > 0);
 
 	DCPTimePeriod period (time, time + DCPTime::from_frames (audio->frames(), _frame_rate));
@@ -164,5 +161,4 @@ void
 AudioMerger::clear ()
 {
 	_buffers.clear ();
-	_last_pull = DCPTime ();
 }