Fix some formatting errors in the it_IT translation.

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

diff --git a/src/lib/audio_merger.h b/src/lib/audio_merger.h
index 87bda7f8b2f58fa190379d85ac21cd2e1e16e0a1..dbc0c869103b44d69b5bbe301e9134bcdb752f02 100644 (file)
--- a/src/lib/audio_merger.h
+++ b/src/lib/audio_merger.h
@@ -17,22 +17,29 @@
 
 */
 
+/** @file  src/audio_merger.h
+ *  @brief AudioMerger class.
+ */
+
 #include "audio_buffers.h"
 #include "dcpomatic_time.h"
 #include "util.h"
 
+/** @class AudioMerger.
+ *  @brief A class that can merge audio data from many sources.
+ */
 class AudioMerger
 {
 public:
-       AudioMerger (int frame_rate);
+       explicit AudioMerger (int frame_rate);
 
-       /** Pull audio up to a given time; after this call, no more data can be pushed
-        *  before the specified time.
-        */
        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;
+
        class Buffer
        {
        public:
@@ -72,6 +79,5 @@ private:
        };
 
        std::list<Buffer> _buffers;
-       DCPTime _last_pull;
        int _frame_rate;
 };