projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Barely-functioning GL playback with new arrangement.
[dcpomatic.git]
/
src
/
lib
/
upmixer_a.cc
diff --git
a/src/lib/upmixer_a.cc
b/src/lib/upmixer_a.cc
index a01ff30bb40f39dfbd2e6199e152a1513de6d549..ca42cd3867ab7e935b1713ea83d36f51a810a7c9 100644
(file)
--- a/
src/lib/upmixer_a.cc
+++ b/
src/lib/upmixer_a.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2014-2015 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/>.
*/
*/
@@
-72,7
+73,7
@@
UpmixerA::run (shared_ptr<const AudioBuffers> in, int channels)
/* Mix of L and R; -6dB down in amplitude (3dB in terms of power) */
shared_ptr<AudioBuffers> in_LR = in_L->clone ();
/* Mix of L and R; -6dB down in amplitude (3dB in terms of power) */
shared_ptr<AudioBuffers> in_LR = in_L->clone ();
- in_LR->accumulate_frames (in_R.get(),
0, 0, in_R->frames ()
);
+ in_LR->accumulate_frames (in_R.get(),
in_R->frames(), 0, 0
);
in_LR->apply_gain (-6);
/* Run filters */
in_LR->apply_gain (-6);
/* Run filters */