X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_ring_buffers.cc;h=21c4b6a5c1084123c71d82706653615e96aab709;hb=25043fac5a810cc7d906f1b3d88d0ae90f2a2299;hp=f51ff8a38860e03b7d3e867b9fea9e861d46ead4;hpb=54e6f206305d4275808cfce36987edcc61a6a779;p=dcpomatic.git

diff --git a/src/lib/audio_ring_buffers.cc b/src/lib/audio_ring_buffers.cc
index f51ff8a38..21c4b6a5c 100644
--- a/src/lib/audio_ring_buffers.cc
+++ b/src/lib/audio_ring_buffers.cc
@@ -38,14 +38,19 @@ AudioRingBuffers::AudioRingBuffers ()
 
 }
 
+/** @param frame_rate Frame rate in use; this is only used to check timing consistency of the incoming data */
 void
-AudioRingBuffers::put (shared_ptr<const AudioBuffers> data, DCPTime time)
+AudioRingBuffers::put (shared_ptr<const AudioBuffers> data, DCPTime time, int frame_rate)
 {
 	boost::mutex::scoped_lock lm (_mutex);
 
 	if (!_buffers.empty()) {
 		DCPOMATIC_ASSERT (_buffers.front().first->channels() == data->channels());
-		DCPOMATIC_ASSERT ((_buffers.back().second + DCPTime::from_frames(_buffers.back().first->frames(), 48000)) == time);
+		DCPTime const end = (_buffers.back().second + DCPTime::from_frames(_buffers.back().first->frames(), frame_rate));
+		if (labs(end.get() - time.get()) > 1) {
+			cout << "bad put " << to_string(_buffers.back().second) << " " << _buffers.back().first->frames() << " " << to_string(time) << "\n";
+		}
+		DCPOMATIC_ASSERT (labs(end.get() - time.get()) < 2);
 	}
 
 	_buffers.push_back(make_pair(data, time));