X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Faudio_merger.h;h=6c9d87097c6fc4458706317338f3dac426d863d8;hb=10da8c6ef355d86cb3c0859f264d7d649dce4619;hp=87bda7f8b2f58fa190379d85ac21cd2e1e16e0a1;hpb=58dce923b9d438a27ce1cd7e3125370f74d46e3a;p=dcpomatic.git

diff --git a/src/lib/audio_merger.h b/src/lib/audio_merger.h
index 87bda7f8b..6c9d87097 100644
--- 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);
 
-	/** 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;
 };