Remove some old Centos 5 support.

[dcpomatic.git] / src / lib / upmixer_b.cc

diff --git a/src/lib/upmixer_b.cc b/src/lib/upmixer_b.cc
index 90e1267cdb7af8021ac9ab16484ee340e24b3c28..317108f41799a6a85f2feff1d4b38fdf7c54a9da 100644 (file)
--- a/src/lib/upmixer_b.cc
+++ b/src/lib/upmixer_b.cc
@@ -27,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)
@@ -68,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) {
@@ -130,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;
 }