Fix thinko in previous.

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

diff --git a/src/lib/audio_merger.h b/src/lib/audio_merger.h
index c3e627fcd7ccc60656254ee3f5f40e21e4f232f5..e685a28bf0287c809ce8edaf243be8388925b63c 100644 (file)
--- a/src/lib/audio_merger.h
+++ b/src/lib/audio_merger.h
@@ -17,6 +17,9 @@
 
 */
 
+#ifndef DCPOMATIC_AUDIO_MERGER_H
+#define DCPOMATIC_AUDIO_MERGER_H
+
 /** @file  src/audio_merger.h
  *  @brief AudioMerger class.
  */
@@ -31,7 +34,7 @@
 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);
@@ -79,6 +82,7 @@ private:
        };
 
        std::list<Buffer> _buffers;
-       DCPTime _last_pull;
        int _frame_rate;
 };
+
+#endif