X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fupmixer_b.cc;h=317108f41799a6a85f2feff1d4b38fdf7c54a9da;hb=751fdbbd5b8d7bb18fece5d08b7dd65e401d93b7;hp=9408fdf83fa10b2046e77a4afb59720568ea225f;hpb=2610abb85fc82056c51c540d7a3d8f691dfe3403;p=dcpomatic.git

diff --git a/src/lib/upmixer_b.cc b/src/lib/upmixer_b.cc
index 9408fdf83..317108f41 100644
--- a/src/lib/upmixer_b.cc
+++ b/src/lib/upmixer_b.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 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,7 +27,7 @@
 using std::string;
 using std::min;
 using std::vector;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 UpmixerB::UpmixerB (int sampling_rate)
 	: _lfe (0.01, 150.0 / sampling_rate)
@@ -67,7 +68,7 @@ UpmixerB::run (shared_ptr<const AudioBuffers> in, int channels)
 
 	/* L + R minus 6dB (in terms of amplitude) */
 	shared_ptr<AudioBuffers> 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) {
@@ -129,11 +130,11 @@ UpmixerB::make_audio_mapping_default (AudioMapping& mapping) const
 	}
 }
 
-vector<string>
+vector<NamedChannel>
 UpmixerB::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;
 }