Extract common code out into kdm_for_screen()

[dcpomatic.git] / src / lib / upmixer_a.cc

diff --git a/src/lib/upmixer_a.cc b/src/lib/upmixer_a.cc
index 77ab1b082d74856ce8cd8fa27dd57c6eda08d664..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>
 
-    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 <http://www.gnu.org/licenses/>.
 
 */
 
@@ -31,8 +32,8 @@ using boost::shared_ptr;
 UpmixerA::UpmixerA (int sampling_rate)
        : _left (0.02, 1900.0 / sampling_rate, 4800.0 / sampling_rate)
        , _right (0.02, 1900.0 / sampling_rate, 4800.0 / sampling_rate)
-       , _centre (0.002, 150.0 / sampling_rate, 1900.0 / sampling_rate)
-       , _lfe (0.002, 150.0 / sampling_rate)
+       , _centre (0.01, 150.0 / sampling_rate, 1900.0 / sampling_rate)
+       , _lfe (0.01, 150.0 / sampling_rate)
        , _ls (0.02, 4800.0 / sampling_rate, 20000.0 / sampling_rate)
        , _rs (0.02, 4800.0 / sampling_rate, 20000.0 / sampling_rate)
 {
@@ -45,7 +46,6 @@ UpmixerA::name () const
        return _("Stereo to 5.1 up-mixer A");
 }
 
-
 string
 UpmixerA::id () const
 {
@@ -73,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 ();
-       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 */