summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-04-23 21:21:39 +0100
committerCarl Hetherington <cth@carlh.net>2017-04-23 21:21:39 +0100
commit8cf721f7d88fb110e8f56b7dcd9cc4a6586d5a54 (patch)
tree0c72bafbea192ca6951bdcf892adff94060988aa /src/lib
parentaf9894563f66e8d63256535f65dcb296ee044139 (diff)
Add AudioMerger::clear() method.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/audio_merger.cc7
-rw-r--r--src/lib/audio_merger.h1
2 files changed, 8 insertions, 0 deletions
diff --git a/src/lib/audio_merger.cc b/src/lib/audio_merger.cc
index ecfdfdc27..275a47691 100644
--- a/src/lib/audio_merger.cc
+++ b/src/lib/audio_merger.cc
@@ -157,3 +157,10 @@ AudioMerger::push (boost::shared_ptr<const AudioBuffers> audio, DCPTime time)
}
}
}
+
+void
+AudioMerger::clear ()
+{
+ _buffers.clear ();
+ _last_pull = DCPTime ();
+}
diff --git a/src/lib/audio_merger.h b/src/lib/audio_merger.h
index ffca29c57..c3e627fcd 100644
--- a/src/lib/audio_merger.h
+++ b/src/lib/audio_merger.h
@@ -35,6 +35,7 @@ public:
std::list<std::pair<boost::shared_ptr<AudioBuffers>, DCPTime> > pull (DCPTime time);
void push (boost::shared_ptr<const AudioBuffers> audio, DCPTime time);
+ void clear ();
private:
Frame frames (DCPTime t) const;