X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fupmixer_b.cc;h=2847da03b520341a1f557a1bab5b04285421a084;hp=9340582c3398883afd186c3de90b50dd939a1b60;hb=386e25f3b9d3fa59cbdeed458d9b3e0d21e338b8;hpb=0dfd150ac546eb42067cb51b6d4386fadc24afab diff --git a/src/lib/upmixer_b.cc b/src/lib/upmixer_b.cc index 9340582c3..2847da03b 100644 --- a/src/lib/upmixer_b.cc +++ b/src/lib/upmixer_b.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2015 Carl Hetherington - 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. - 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 - 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 . */ @@ -29,7 +30,7 @@ using std::vector; using boost::shared_ptr; UpmixerB::UpmixerB (int sampling_rate) - : _lfe (0.02, 20.0 / sampling_rate, 150.0 / sampling_rate) + : _lfe (0.01, 150.0 / sampling_rate) , _delay (0.02 * sampling_rate) { @@ -67,7 +68,7 @@ UpmixerB::run (shared_ptr in, int channels) /* L + R minus 6dB (in terms of amplitude) */ shared_ptr in_LR = in->channel(0); - in_LR->accumulate_frames (in->channel(1).get(), 0, 0, in->frames()); + in_LR->accumulate_frames (in->channel(1).get(), in->frames(), 0, 0); in_LR->apply_gain (-6); if (channels > 0) {