Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.

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

diff --git a/src/lib/upmixer_a.h b/src/lib/upmixer_a.h
index 111846fe02856ae86e648a1da98fe7b1095a13c0..de02a8d959d7f09d4d5f070b60bd58c6341ac438 100644 (file)
--- 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/>.
 
 */
 
@@ -31,13 +32,12 @@ class UpmixerA : public AudioProcessor
 {
 public:
        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;
@@ -46,7 +46,7 @@ private:
        BandPassAudioFilter _left;
        BandPassAudioFilter _right;
        BandPassAudioFilter _centre;
-       BandPassAudioFilter _lfe;
+       LowPassAudioFilter _lfe;
        BandPassAudioFilter _ls;
        BandPassAudioFilter _rs;
 };