X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_processor.cc;h=0d3f2b6d7ecc2b0a0259a8018e2964c1f19ae9fa;hp=f350cc2aa0404553ce8f11ff8a8dbe10e99c143e;hb=HEAD;hpb=5e4f001bf32e3cdf65efa34803d70e6c1c00c66b

diff --git a/src/lib/audio_processor.cc b/src/lib/audio_processor.cc
index f350cc2aa..6f3b96145 100644
--- a/src/lib/audio_processor.cc
+++ b/src/lib/audio_processor.cc
@@ -1,52 +1,98 @@
 /*
-    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;
+using std::unique_ptr;
+using std::vector;
+
+
+vector<unique_ptr<const AudioProcessor>> AudioProcessor::_experimental;
+vector<unique_ptr<const AudioProcessor>> AudioProcessor::_non_experimental;
 
-list<AudioProcessor const *> AudioProcessor::_all;
 
 void
 AudioProcessor::setup_audio_processors ()
 {
-	_all.push_back (new MidSideDecoder ());
-	_all.push_back (new UpmixerA (48000));
+	_non_experimental.push_back (unique_ptr<AudioProcessor>(new MidSideDecoder()));
+
+	_experimental.push_back (unique_ptr<AudioProcessor>(new UpmixerA(48000)));
+	_experimental.push_back (unique_ptr<AudioProcessor>(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: _non_experimental) {
+		if (i->id() == id) {
+			return i.get();
+		}
+	}
+
+	for (auto& i: _experimental) {
+		if (i->id() == id) {
+			return i.get();
+		}
+	}
+
+	return nullptr;
+}
+
+
+vector<AudioProcessor const *>
+AudioProcessor::visible ()
+{
+	vector<AudioProcessor const *> raw;
+	if (Config::instance()->show_experimental_audio_processors()) {
+		for (auto& processor: _experimental) {
+			raw.push_back (processor.get());
 		}
 	}
 
-	return 0;
+	for (auto& processor: _non_experimental) {
+		raw.push_back (processor.get());
+	}
+
+	return raw;
 }
 
-list<AudioProcessor const *>
+
+vector<AudioProcessor const *>
 AudioProcessor::all ()
 {
-	return _all;
+	vector<AudioProcessor const *> raw;
+	for (auto& processor: _experimental) {
+		raw.push_back (processor.get());
+	}
+
+	for (auto& processor: _non_experimental) {
+		raw.push_back (processor.get());
+	}
+
+	return raw;
 }