X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_delay.cc;h=d06d9e73023055d8d060ae322bd64cc63e379f0c;hb=d311043bf3c1e3e7f41b314f7ab7c91ed7e5aa7f;hp=e33d9879b1f2fe20064e93cbcbff8688c277e69d;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;p=dcpomatic.git diff --git a/src/lib/audio_delay.cc b/src/lib/audio_delay.cc index e33d9879b..d06d9e730 100644 --- a/src/lib/audio_delay.cc +++ b/src/lib/audio_delay.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2015 Carl Hetherington + Copyright (C) 2015-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,15 +18,17 @@ */ + #include "audio_delay.h" #include "audio_buffers.h" #include "dcpomatic_assert.h" -#include #include + using std::cout; -using boost::shared_ptr; -using boost::make_shared; +using std::make_shared; +using std::shared_ptr; + AudioDelay::AudioDelay (int samples) : _samples (samples) @@ -34,13 +36,14 @@ AudioDelay::AudioDelay (int samples) } + shared_ptr AudioDelay::run (shared_ptr in) { /* You can't call this with varying channel counts */ DCPOMATIC_ASSERT (!_tail || in->channels() == _tail->channels()); - shared_ptr out = make_shared (in->channels(), in->frames()); + auto out = make_shared(in->channels(), in->frames()); if (in->frames() > _samples) { @@ -57,7 +60,7 @@ AudioDelay::run (shared_ptr in) /* Keep tail */ if (!_tail) { - _tail.reset (new AudioBuffers (in->channels(), _samples)); + _tail = make_shared(in->channels(), _samples); } _tail->copy_from (in.get(), _samples, in->frames() - _samples, 0); @@ -68,12 +71,12 @@ AudioDelay::run (shared_ptr in) out->copy_from (_tail.get(), out->frames(), 0, 0); } else { out->make_silent (); - _tail.reset (new AudioBuffers (out->channels(), _samples)); + _tail = make_shared(out->channels(), _samples); _tail->make_silent (); } /* Shuffle the tail down */ - _tail->move (out->frames(), 0, _tail->frames() - out->frames()); + _tail->move (_tail->frames() - out->frames(), out->frames(), 0); /* Copy input into the tail */ _tail->copy_from (in.get(), in->frames(), 0, _tail->frames() - in->frames()); @@ -82,6 +85,7 @@ AudioDelay::run (shared_ptr in) return out; } + void AudioDelay::flush () {