Make a new AudioBuffers constructor and use it to avoid some use of the more complicated copy_from.

5 files changed, 19 insertions, 19 deletions

diff --git a/src/lib/audio_buffers.cc b/src/lib/audio_buffers.cc
index 63204dd6a..cceb12672 100644
--- a/src/lib/audio_buffers.cc
+++ b/src/lib/audio_buffers.cc
@@ -52,6 +52,12 @@ AudioBuffers::AudioBuffers (boost::shared_ptr<const AudioBuffers> other)
 	copy_from (other.get(), other->_frames, 0, 0);
 }
 
+AudioBuffers::AudioBuffers (boost::shared_ptr<const AudioBuffers> other, int32_t frames_to_copy, int32_t read_offset)
+{
+	allocate (other->_channels, frames_to_copy);
+	copy_from (other.get(), frames_to_copy, read_offset, 0);
+}
+
 AudioBuffers &
 AudioBuffers::operator= (AudioBuffers const & other)
 {
diff --git a/src/lib/audio_buffers.h b/src/lib/audio_buffers.h
index 64ad4ba95..63e4fac9d 100644
--- a/src/lib/audio_buffers.h
+++ b/src/lib/audio_buffers.h
@@ -41,6 +41,7 @@ public:
 	AudioBuffers (int channels, int32_t frames);
 	AudioBuffers (AudioBuffers const &);
 	explicit AudioBuffers (boost::shared_ptr<const AudioBuffers>);
+	AudioBuffers (boost::shared_ptr<const AudioBuffers> other, int32_t frames_to_copy, int32_t read_offset);
 	~AudioBuffers ();
 
 	AudioBuffers & operator= (AudioBuffers const &);
diff --git a/src/lib/audio_merger.cc b/src/lib/audio_merger.cc
index 667068f8f..74bb7717d 100644
--- a/src/lib/audio_merger.cc
+++ b/src/lib/audio_merger.cc
@@ -67,13 +67,13 @@ AudioMerger::pull (DCPTime time)
 			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);
 			}
@@ -134,8 +134,7 @@ 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()) {
 			if (part->frames() > 0) {
diff --git a/src/lib/player.cc b/src/lib/player.cc
index bc0aa3b28..304f8c723 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -900,9 +900,7 @@ Player::audio (weak_ptr<Piece> wp, AudioStreamPtr stream, ContentAudio content_a
 		if (remaining_frames == 0) {
 			return;
 		}
-		shared_ptr<AudioBuffers> cut (new AudioBuffers (content_audio.audio->channels(), remaining_frames));
-		cut->copy_from (content_audio.audio.get(), remaining_frames, 0, 0);
-		content_audio.audio = cut;
+		content_audio.audio.reset (new AudioBuffers(content_audio.audio, remaining_frames, 0));
 	}
 
 	DCPOMATIC_ASSERT (content_audio.audio->frames() > 0);
@@ -1195,8 +1193,7 @@ Player::discard_audio (shared_ptr<const AudioBuffers> audio, DCPTime time, DCPTi
 	if (remaining_frames <= 0) {
 		return make_pair(shared_ptr<AudioBuffers>(), DCPTime());
 	}
-	shared_ptr<AudioBuffers> cut (new AudioBuffers (audio->channels(), remaining_frames));
-	cut->copy_from (audio.get(), remaining_frames, discard_frames, 0);
+	shared_ptr<AudioBuffers> cut (new AudioBuffers(audio, remaining_frames, discard_frames));
 	return make_pair(cut, time + discard_time);
 }
 
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index d85db5689..c1b66cd4c 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -284,15 +284,12 @@ Writer::write (shared_ptr<const AudioBuffers> audio, DCPTime const time)
 			};
 
 			if (part_frames[0]) {
-				shared_ptr<AudioBuffers> part (new AudioBuffers (audio->channels(), part_frames[0]));
-				part->copy_from (audio.get(), part_frames[0], 0, 0);
+				shared_ptr<AudioBuffers> part (new AudioBuffers(audio, part_frames[0], 0));
 				_audio_reel->write (part);
 			}
 
 			if (part_frames[1]) {
-				shared_ptr<AudioBuffers> part (new AudioBuffers (audio->channels(), part_frames[1]));
-				part->copy_from (audio.get(), part_frames[1], part_frames[0], 0);
-				audio = part;
+				audio.reset (new AudioBuffers(audio, part_frames[1], part_frames[0]));
 			} else {
 				audio.reset ();
 			}