1 files changed, 10 insertions, 1 deletions
diff --git a/src/lib/audio_merger.h b/src/lib/audio_merger.h
index 226601e0e..f068b504e 100644
--- a/src/lib/audio_merger.h
+++ b/src/lib/audio_merger.h
@@ -37,6 +37,8 @@ public:
 	TimedAudioBuffers<T>
 	pull (T time)
 	{
+		assert (time >= _last_pull);
+		
 		TimedAudioBuffers<T> out;
 		
 		F const to_return = _t_to_f (time - _last_pull);
@@ -97,9 +99,16 @@ public:
 		if (_buffers->frames() == 0) {
 			return TimedAudioBuffers<T> ();
 		}
-		
+
 		return TimedAudioBuffers<T> (_buffers, _last_pull);
 	}
+
+	void
+	clear (DCPTime t)
+	{
+		_last_pull = t;
+		_buffers.reset (new AudioBuffers (_buffers->channels(), 0));
+	}
 	
 private:
 	boost::shared_ptr<AudioBuffers> _buffers;