Fix the build for older macOS.

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

diff --git a/src/lib/mid_side_decoder.cc b/src/lib/mid_side_decoder.cc
index b9b8dd098c9459e2524de2633c36520632631956..09b528c81676fa0e1c62c3b1d4755632a56a1eee 100644 (file)
--- a/src/lib/mid_side_decoder.cc
+++ b/src/lib/mid_side_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,16 +18,20 @@
 
 */
 
+
 #include "mid_side_decoder.h"
 #include "audio_buffers.h"
 #include "audio_mapping.h"
 
 #include "i18n.h"
 
-using std::string;
+
+using std::make_shared;
 using std::min;
+using std::shared_ptr;
+using std::string;
 using std::vector;
-using boost::shared_ptr;
+
 
 string
 MidSideDecoder::name () const
@@ -35,33 +39,37 @@ MidSideDecoder::name () const
        return _("Mid-side decoder");
 }
 
+
 string
 MidSideDecoder::id () const
 {
        return N_("mid-side-decoder");
 }
 
+
 int
 MidSideDecoder::out_channels () const
 {
        return 3;
 }
 
+
 shared_ptr<AudioProcessor>
 MidSideDecoder::clone (int) const
 {
-       return shared_ptr<AudioProcessor> (new MidSideDecoder ());
+       return make_shared<MidSideDecoder>();
 }
 
+
 shared_ptr<AudioBuffers>
 MidSideDecoder::run (shared_ptr<const AudioBuffers> in, int channels)
 {
        int const N = min (channels, 3);
-       shared_ptr<AudioBuffers> out (new AudioBuffers (channels, in->frames ()));
+       auto out = make_shared<AudioBuffers>(channels, in->frames ());
        for (int i = 0; i < in->frames(); ++i) {
-               float const left = in->data()[0][i];
-               float const right = in->data()[1][i];
-               float const mid = (left + right) / 2;
+               auto const left = in->data()[0][i];
+               auto const right = in->data()[1][i];
+               auto const mid = (left + right) / 2;
                if (N > 0) {
                        out->data()[0][i] = left - mid;
                }
@@ -80,23 +88,23 @@ MidSideDecoder::run (shared_ptr<const AudioBuffers> in, int channels)
        return out;
 }
 
+
 void
 MidSideDecoder::make_audio_mapping_default (AudioMapping& mapping) const
 {
        /* Just map the first two input channels to our M/S */
        mapping.make_zero ();
-       for (int i = 0; i < min (2, mapping.input_channels()); ++i) {
+       for (int i = 0; i < min(2, mapping.input_channels()); ++i) {
                mapping.set (i, i, 1);
        }
 }
 
-vector<string>
+
+vector<NamedChannel>
 MidSideDecoder::input_names () const
 {
-       vector<string> n;
-
-       n.push_back (_("Left"));
-       n.push_back (_("Right"));
-
-       return n;
+       return {
+               NamedChannel(_("Left"), 0),
+               NamedChannel(_("Right"), 1)
+       };
 }