Finish off background image support for swaroop variant.

[dcpomatic.git] / src / lib / audio_merger.h

diff --git a/src/lib/audio_merger.h b/src/lib/audio_merger.h
index ffca29c57cdf471908115a42b6fc01fee3c8ffe8..dbc0c869103b44d69b5bbe301e9134bcdb752f02 100644 (file)
--- a/src/lib/audio_merger.h
+++ b/src/lib/audio_merger.h
@@ -31,10 +31,11 @@
 class AudioMerger
 {
 public:
-       AudioMerger (int frame_rate);
+       explicit AudioMerger (int frame_rate);
 
        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;
@@ -78,6 +79,5 @@ private:
        };
 
        std::list<Buffer> _buffers;
-       DCPTime _last_pull;
        int _frame_rate;
 };