X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fupmixer_a.h;h=18569dcfadc957845aead7ca26a722c7214afa43;hb=ba9fb85168d004d7643dc02f911fd173a136758b;hp=389d52d2594362ea75e0b6132c844be0433d028c;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;p=dcpomatic.git

diff --git a/src/lib/upmixer_a.h b/src/lib/upmixer_a.h
index 389d52d25..18569dcfa 100644
--- a/src/lib/upmixer_a.h
+++ b/src/lib/upmixer_a.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2014 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/>.
 
 */
 
@@ -30,23 +31,22 @@
 class UpmixerA : public AudioProcessor
 {
 public:
-	UpmixerA (int sampling_rate);
+	explicit UpmixerA (int sampling_rate);
 
 	std::string name () const;
 	std::string id () const;
-	ChannelCount in_channels () const;
 	int out_channels () const;
 	boost::shared_ptr<AudioProcessor> clone (int) const;
-	boost::shared_ptr<AudioBuffers> run (boost::shared_ptr<const AudioBuffers>);
+	boost::shared_ptr<AudioBuffers> run (boost::shared_ptr<const AudioBuffers>, int channels);
 	void flush ();
 	void make_audio_mapping_default (AudioMapping& mapping) const;
-	std::vector<std::string> input_names () const;
+	std::vector<NamedChannel> input_names () const;
 
 private:
 	BandPassAudioFilter _left;
 	BandPassAudioFilter _right;
 	BandPassAudioFilter _centre;
-	BandPassAudioFilter _lfe;
+	LowPassAudioFilter _lfe;
 	BandPassAudioFilter _ls;
 	BandPassAudioFilter _rs;
 };