X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_merger.cc;h=06eba098f4dd6424f5c096baa6a25cbcb9f18e30;hp=1cc5ff0a19de156bdee0e7e6a6dd3da56e47dc49;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hpb=c4403784febdbdd42e9c32e67fadb147f11fe566

diff --git a/src/lib/audio_merger.cc b/src/lib/audio_merger.cc
index 1cc5ff0a1..06eba098f 100644
--- a/src/lib/audio_merger.cc
+++ b/src/lib/audio_merger.cc
@@ -31,7 +31,7 @@ using std::max;
 using std::list;
 using std::cout;
 using std::make_pair;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 using namespace dcpomatic;
 
@@ -60,20 +60,20 @@ AudioMerger::pull (DCPTime time)
 	list<Buffer> new_buffers;
 
 	_buffers.sort (AudioMerger::BufferComparator());
-	BOOST_FOREACH (Buffer i, _buffers) {
+	for (auto i: _buffers) {
 		if (i.period().to <= time) {
 			/* Completely within the pull period */
 			DCPOMATIC_ASSERT (i.audio->frames() > 0);
 			out.push_back (make_pair (i.audio, i.time));
 		} else if (i.time < time) {
 			/* Overlaps the end of the pull period */
-			shared_ptr<AudioBuffers> audio (new AudioBuffers (i.audio->channels(), frames(DCPTime(time - i.time))));
-			/* Though time > i.time, audio->frames() could be 0 if the difference in time is less than one frame */
-			if (audio->frames() > 0) {
-				audio->copy_from (i.audio.get(), audio->frames(), 0, 0);
-				out.push_back (make_pair (audio, i.time));
-				i.audio->trim_start (audio->frames ());
-				i.time += DCPTime::from_frames(audio->frames(), _frame_rate);
+			int32_t const overlap = frames(DCPTime(time - i.time));
+			/* Though time > i.time, overlap could be 0 if the difference in time is less than one frame */
+			if (overlap > 0) {
+				shared_ptr<AudioBuffers> audio(new AudioBuffers(i.audio, overlap, 0));
+				out.push_back (make_pair(audio, i.time));
+				i.audio->trim_start (overlap);
+				i.time += DCPTime::from_frames(overlap, _frame_rate);
 				DCPOMATIC_ASSERT (i.audio->frames() > 0);
 				new_buffers.push_back (i);
 			}
@@ -95,14 +95,14 @@ AudioMerger::pull (DCPTime time)
 
 /** Push some data into the merger at a given time */
 void
-AudioMerger::push (boost::shared_ptr<const AudioBuffers> audio, DCPTime time)
+AudioMerger::push (std::shared_ptr<const AudioBuffers> audio, DCPTime time)
 {
 	DCPOMATIC_ASSERT (audio->frames() > 0);
 
 	DCPTimePeriod period (time, time + DCPTime::from_frames (audio->frames(), _frame_rate));
 
 	/* Mix any overlapping parts of this new block with existing ones */
-	BOOST_FOREACH (Buffer i, _buffers) {
+	for (auto i: _buffers) {
 		optional<DCPTimePeriod> overlap = i.period().overlap (period);
 		if (overlap) {
 			int32_t const offset = frames(DCPTime(overlap->from - i.time));
@@ -116,12 +116,12 @@ AudioMerger::push (boost::shared_ptr<const AudioBuffers> audio, DCPTime time)
 	}
 
 	list<DCPTimePeriod> periods;
-	BOOST_FOREACH (Buffer i, _buffers) {
+	for (auto i: _buffers) {
 		periods.push_back (i.period ());
 	}
 
 	/* Add the non-overlapping parts */
-	BOOST_FOREACH (DCPTimePeriod i, subtract (period, periods)) {
+	for (auto i: subtract(period, periods)) {
 		list<Buffer>::iterator before = _buffers.end();
 		list<Buffer>::iterator after = _buffers.end();
 		for (list<Buffer>::iterator j = _buffers.begin(); j != _buffers.end(); ++j) {
@@ -134,13 +134,13 @@ AudioMerger::push (boost::shared_ptr<const AudioBuffers> audio, DCPTime time)
 		}
 
 		/* Get the part of audio that we want to use */
-		shared_ptr<AudioBuffers> part (new AudioBuffers (audio->channels(), frames(i.to) - frames(i.from)));
-		part->copy_from (audio.get(), part->frames(), frames(DCPTime(i.from - time)), 0);
+		shared_ptr<AudioBuffers> part (new AudioBuffers(audio, frames(i.to) - frames(i.from), frames(DCPTime(i.from - time))));
 
 		if (before == _buffers.end() && after == _buffers.end()) {
-			/* New buffer */
-			DCPOMATIC_ASSERT (part->frames() > 0);
-			_buffers.push_back (Buffer (part, time, _frame_rate));
+			if (part->frames() > 0) {
+				/* New buffer */
+				_buffers.push_back (Buffer (part, time, _frame_rate));
+			}
 		} else if (before != _buffers.end() && after == _buffers.end()) {
 			/* We have an existing buffer before this one; append new data to it */
 			before->audio->append (part);