projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use a vector rather than a list when returning from content_factory().
[dcpomatic.git]
/
src
/
lib
/
audio_delay.cc
diff --git
a/src/lib/audio_delay.cc
b/src/lib/audio_delay.cc
index 076d10d6fa3a85ae92f674ca837d0fd8cb852a0d..d06d9e73023055d8d060ae322bd64cc63e379f0c 100644
(file)
--- a/
src/lib/audio_delay.cc
+++ b/
src/lib/audio_delay.cc
@@
-1,29
+1,34
@@
/*
/*
- Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2015
-2021
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
+
#include "audio_delay.h"
#include "audio_buffers.h"
#include "dcpomatic_assert.h"
#include <iostream>
#include "audio_delay.h"
#include "audio_buffers.h"
#include "dcpomatic_assert.h"
#include <iostream>
+
using std::cout;
using std::cout;
-using boost::shared_ptr;
+using std::make_shared;
+using std::shared_ptr;
+
AudioDelay::AudioDelay (int samples)
: _samples (samples)
AudioDelay::AudioDelay (int samples)
: _samples (samples)
@@
-31,13
+36,14
@@
AudioDelay::AudioDelay (int samples)
}
}
+
shared_ptr<AudioBuffers>
AudioDelay::run (shared_ptr<const AudioBuffers> in)
{
/* You can't call this with varying channel counts */
DCPOMATIC_ASSERT (!_tail || in->channels() == _tail->channels());
shared_ptr<AudioBuffers>
AudioDelay::run (shared_ptr<const AudioBuffers> in)
{
/* You can't call this with varying channel counts */
DCPOMATIC_ASSERT (!_tail || in->channels() == _tail->channels());
-
shared_ptr<AudioBuffers> out (new AudioBuffers (in->channels(), in->frames()
));
+
auto out = make_shared<AudioBuffers>(in->channels(), in->frames(
));
if (in->frames() > _samples) {
if (in->frames() > _samples) {
@@
-54,7
+60,7
@@
AudioDelay::run (shared_ptr<const AudioBuffers> in)
/* Keep tail */
if (!_tail) {
/* Keep tail */
if (!_tail) {
- _tail
.reset (new AudioBuffers (in->channels(), _samples)
);
+ _tail
= make_shared<AudioBuffers>(in->channels(), _samples
);
}
_tail->copy_from (in.get(), _samples, in->frames() - _samples, 0);
}
_tail->copy_from (in.get(), _samples, in->frames() - _samples, 0);
@@
-65,12
+71,12
@@
AudioDelay::run (shared_ptr<const AudioBuffers> in)
out->copy_from (_tail.get(), out->frames(), 0, 0);
} else {
out->make_silent ();
out->copy_from (_tail.get(), out->frames(), 0, 0);
} else {
out->make_silent ();
- _tail
.reset (new AudioBuffers (out->channels(), _samples)
);
+ _tail
= make_shared<AudioBuffers>(out->channels(), _samples
);
_tail->make_silent ();
}
/* Shuffle the tail down */
_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());
/* Copy input into the tail */
_tail->copy_from (in.get(), in->frames(), 0, _tail->frames() - in->frames());
@@
-79,6
+85,7
@@
AudioDelay::run (shared_ptr<const AudioBuffers> in)
return out;
}
return out;
}
+
void
AudioDelay::flush ()
{
void
AudioDelay::flush ()
{