X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fupmixer_a.cc;h=ca42cd3867ab7e935b1713ea83d36f51a810a7c9;hb=0e8a1ab7c41756115f44229053e1e7024530fb32;hp=a01ff30bb40f39dfbd2e6199e152a1513de6d549;hpb=2610abb85fc82056c51c540d7a3d8f691dfe3403;p=dcpomatic.git diff --git a/src/lib/upmixer_a.cc b/src/lib/upmixer_a.cc index a01ff30bb..ca42cd386 100644 --- a/src/lib/upmixer_a.cc +++ b/src/lib/upmixer_a.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2014-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 . */ @@ -72,7 +73,7 @@ UpmixerA::run (shared_ptr in, int channels) /* Mix of L and R; -6dB down in amplitude (3dB in terms of power) */ shared_ptr 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 */