projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix merging of audio in various circumstances.
[dcpomatic.git]
/
src
/
lib
/
audio_delay.cc
diff --git
a/src/lib/audio_delay.cc
b/src/lib/audio_delay.cc
index 893773ddd27a5304539ff3d2e0d95f59f7394cb7..391a201a25253e980931431798aa948cf09ba9b6 100644
(file)
--- a/
src/lib/audio_delay.cc
+++ b/
src/lib/audio_delay.cc
@@
-71,7
+71,7
@@
AudioDelay::run (shared_ptr<const AudioBuffers> in)
}
/* Shuffle the tail down */
}
/* 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());