projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ignore .AppleDouble folders inside DCPs.
[dcpomatic.git]
/
src
/
lib
/
audio_delay.cc
diff --git
a/src/lib/audio_delay.cc
b/src/lib/audio_delay.cc
index e33d9879b1f2fe20064e93cbcbff8688c277e69d..90214470cd279185cd2e4a3ef4f7ef825c978a16 100644
(file)
--- a/
src/lib/audio_delay.cc
+++ b/
src/lib/audio_delay.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2015
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
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 "audio_delay.h"
#include "audio_buffers.h"
#include "dcpomatic_assert.h"
-#include <boost/make_shared.hpp>
#include <iostream>
#include <iostream>
+
using std::cout;
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)
AudioDelay::AudioDelay (int samples)
: _samples (samples)
@@
-34,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
= make_shared<AudioBuffers> (in->channels(), in->frames(
));
+ shared_ptr<AudioBuffers> out
(new AudioBuffers (in->channels(), in->frames()
));
if (in->frames() > _samples) {
if (in->frames() > _samples) {
@@
-57,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);
@@
-68,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());
@@
-82,6
+85,7
@@
AudioDelay::run (shared_ptr<const AudioBuffers> in)
return out;
}
return out;
}
+
void
AudioDelay::flush ()
{
void
AudioDelay::flush ()
{