std::shared_ptr

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

diff --git a/src/lib/upmixer_a.cc b/src/lib/upmixer_a.cc
index a1221e5ac580e78b5acc6966169458189583c628..d8cfb4fff67bb9138861c7fce6cd31cd056034f7 100644 (file)
--- a/src/lib/upmixer_a.cc
+++ b/src/lib/upmixer_a.cc
@@ -27,7 +27,7 @@
 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)
@@ -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;
 }