From 17e80bc37eea735629e13f068005653428c44cce Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 28 Feb 2017 11:09:38 +0000
Subject: Some comments and a few small cleanups.

---
 src/lib/audio_merger.h | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'src/lib/audio_merger.h')

diff --git a/src/lib/audio_merger.h b/src/lib/audio_merger.h
index 87bda7f8b..ffca29c57 100644
--- a/src/lib/audio_merger.h
+++ b/src/lib/audio_merger.h
@@ -17,22 +17,28 @@
 
 */
 
+/** @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);
 
 private:
+	Frame frames (DCPTime t) const;
+
 	class Buffer
 	{
 	public:
-- 
cgit v1.2.3