X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fupmixer_a.cc;h=d8cfb4fff67bb9138861c7fce6cd31cd056034f7;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=0479f16b23f990c04ea350cecf60d67d9a2fdebd;hpb=23f2f73c63fab846435a698797a0d9041dc63722;p=dcpomatic.git

diff --git a/src/lib/upmixer_a.cc b/src/lib/upmixer_a.cc
index 0479f16b2..d8cfb4fff 100644
--- 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/>.
 
 */
 
@@ -26,13 +27,13 @@
 using std::string;
 using std::min;
 using std::vector;
-using boost::shared_ptr;
+using std::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.02, 150.0 / sampling_rate, 1900.0 / sampling_rate)
-	, _lfe (0.02, 20.0 / sampling_rate, 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 */
@@ -120,11 +120,11 @@ UpmixerA::make_audio_mapping_default (AudioMapping& mapping) const
 	}
 }
 
-vector<string>
+vector<NamedChannel>
 UpmixerA::input_names () const
 {
-	vector<string> n;
-	n.push_back (_("Upmix L"));
-	n.push_back (_("Upmix R"));
+	vector<NamedChannel> n;
+	n.push_back (NamedChannel(_("Upmix L"), 0));
+	n.push_back (NamedChannel(_("Upmix R"), 1));
 	return n;
 }