X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_processor.cc;h=1eb796b38ef7ce68e5e0169422a65e6ae81dc848;hp=f350cc2aa0404553ce8f11ff8a8dbe10e99c143e;hb=ac34066d5e448d1984d11a180be74e31b6e13b5c;hpb=22b9f3b2090d8bdfe52cda1e69d3acbe874f1ce5

diff --git a/src/lib/audio_processor.cc b/src/lib/audio_processor.cc
index f350cc2aa..1eb796b38 100644
--- a/src/lib/audio_processor.cc
+++ b/src/lib/audio_processor.cc
@@ -1,50 +1,75 @@
 /*
-    Copyright (C) 2014 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 "audio_processor.h"
+#include "config.h"
 #include "mid_side_decoder.h"
 #include "upmixer_a.h"
+#include "upmixer_b.h"
+
 
 using std::string;
 using std::list;
 
+
 list<AudioProcessor const *> AudioProcessor::_all;
+list<AudioProcessor const *> AudioProcessor::_non_experimental;
+
 
 void
 AudioProcessor::setup_audio_processors ()
 {
-	_all.push_back (new MidSideDecoder ());
-	_all.push_back (new UpmixerA (48000));
+	auto mid_side = new MidSideDecoder ();
+	_all.push_back (mid_side);
+	_non_experimental.push_back (mid_side);
+
+	_all.push_back (new UpmixerA(48000));
+	_all.push_back (new UpmixerB(48000));
 }
 
+
 AudioProcessor const *
 AudioProcessor::from_id (string id)
 {
-	for (list<AudioProcessor const *>::const_iterator i = _all.begin(); i != _all.end(); ++i) {
-		if ((*i)->id() == id) {
-			return *i;
+	for (auto i: _all) {
+		if (i->id() == id) {
+			return i;
 		}
 	}
 
-	return 0;
+	return nullptr;
 }
 
+
+list<AudioProcessor const *>
+AudioProcessor::visible ()
+{
+	if (Config::instance()->show_experimental_audio_processors()) {
+		return _all;
+	}
+
+	return _non_experimental;
+}
+
+
 list<AudioProcessor const *>
 AudioProcessor::all ()
 {