From 915cecb8f2b4bb251e72bbcd6c41144b73f8bfd7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 16 Feb 2020 22:23:28 +0100 Subject: Make a new AudioBuffers constructor and use it to avoid some use of the more complicated copy_from. --- src/lib/player.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/lib/player.cc') 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 wp, AudioStreamPtr stream, ContentAudio content_a if (remaining_frames == 0) { return; } - shared_ptr 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 audio, DCPTime time, DCPTi if (remaining_frames <= 0) { return make_pair(shared_ptr(), DCPTime()); } - shared_ptr cut (new AudioBuffers (audio->channels(), remaining_frames)); - cut->copy_from (audio.get(), remaining_frames, discard_frames, 0); + shared_ptr cut (new AudioBuffers(audio, remaining_frames, discard_frames)); return make_pair(cut, time + discard_time); } -- cgit v1.2.3