X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_merger.h;h=0201fcd4bfd433b57d82ba741e9d699bc6e6faf9;hb=4b102c1fdee4a68533415a759c6f47be33bf2626;hp=87bda7f8b2f58fa190379d85ac21cd2e1e16e0a1;hpb=58dce923b9d438a27ce1cd7e3125370f74d46e3a;p=dcpomatic.git

diff --git a/src/lib/audio_merger.h b/src/lib/audio_merger.h
index 87bda7f8b..0201fcd4b 100644
--- a/src/lib/audio_merger.h
+++ b/src/lib/audio_merger.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,22 +17,32 @@
 
 */
 
+
+/** @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);
+	std::list<std::pair<std::shared_ptr<AudioBuffers>, dcpomatic::DCPTime>> pull (dcpomatic::DCPTime time);
+	void push (std::shared_ptr<const AudioBuffers> audio, dcpomatic::DCPTime time);
+	void clear ();
 
 private:
+	Frame frames (dcpomatic::DCPTime t) const;
+
 	class Buffer
 	{
 	public:
@@ -41,37 +51,27 @@ private:
 		 *  @param t Time
 		 *  @param r Frame rate.
 		 */
-		Buffer (int c, int32_t f, DCPTime t, int r)
-			: audio (new AudioBuffers (c, f))
+		Buffer (int c, int32_t f, dcpomatic::DCPTime t, int r)
+			: audio (std::make_shared<AudioBuffers>(c, f))
 			, time (t)
 			, frame_rate (r)
 		{}
 
-		Buffer (boost::shared_ptr<AudioBuffers> a, DCPTime t, int r)
+		Buffer (std::shared_ptr<AudioBuffers> a, dcpomatic::DCPTime t, int r)
 			: audio (a)
 			, time (t)
 			, frame_rate (r)
 		{}
 
-		boost::shared_ptr<AudioBuffers> audio;
-		DCPTime time;
+		std::shared_ptr<AudioBuffers> audio;
+		dcpomatic::DCPTime time;
 		int frame_rate;
 
-		DCPTimePeriod period () const {
-			return DCPTimePeriod (time, time + DCPTime::from_frames (audio->frames(), frame_rate));
-		}
-	};
-
-	class BufferComparator
-	{
-	public:
-		bool operator() (AudioMerger::Buffer const & a, AudioMerger::Buffer const & b)
-		{
-			return a.time < b.time;
+		dcpomatic::DCPTimePeriod period () const {
+			return dcpomatic::DCPTimePeriod (time, time + dcpomatic::DCPTime::from_frames (audio->frames(), frame_rate));
 		}
 	};
 
 	std::list<Buffer> _buffers;
-	DCPTime _last_pull;
-	int _frame_rate;
+	int const _frame_rate;
 };