summaryrefslogtreecommitdiff
path: root/src/lib/audio_merger.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-12-11 10:31:18 +0000
committerCarl Hetherington <cth@carlh.net>2013-12-11 10:31:18 +0000
commitea910e250a0fb3b0ad3ce0cf32dd27b24c17cd1d (patch)
tree32119d2a04532d3162c656df7c7e715b289c6e61 /src/lib/audio_merger.h
parent3e5df964ada49e10a880a200c985cc309ccecb64 (diff)
Various work on better seeking (and seeking of audio).
Diffstat (limited to 'src/lib/audio_merger.h')
-rw-r--r--src/lib/audio_merger.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/lib/audio_merger.h b/src/lib/audio_merger.h
index 226601e0e..6ad33fb37 100644
--- a/src/lib/audio_merger.h
+++ b/src/lib/audio_merger.h
@@ -97,9 +97,16 @@ public:
if (_buffers->frames() == 0) {
return TimedAudioBuffers<T> ();
}
-
+
return TimedAudioBuffers<T> (_buffers, _last_pull);
}
+
+ void
+ clear (Time t)
+ {
+ _last_pull = t;
+ _buffers.reset (new AudioBuffers (_buffers->channels(), 0));
+ }
private:
boost::shared_ptr<AudioBuffers> _buffers;