X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmid_side_decoder.cc;h=d3d85622c22f30b6cba0d17e372329ce0c563c85;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hp=6aadea1a2242facca8522cf489621480fb2aec95;hpb=dc27e49291d1d4d0bafee8f26e9c204270a4a2d2;p=dcpomatic.git

diff --git a/src/lib/mid_side_decoder.cc b/src/lib/mid_side_decoder.cc
index 6aadea1a2..d3d85622c 100644
--- a/src/lib/mid_side_decoder.cc
+++ b/src/lib/mid_side_decoder.cc
@@ -1,32 +1,37 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 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/>.
 
 */
 
-#include "mid_side_decoder.h"
+
 #include "audio_buffers.h"
 #include "audio_mapping.h"
+#include "mid_side_decoder.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
@@ -34,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;
 		}
@@ -79,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)
+	};
 }