X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fgain_calculator_dialog.cc;h=8818aee9e3bd590591a33343b175d5063639069d;hb=HEAD;hp=133d84c21719cfa30b0718898636987f3f43a5ce;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;p=dcpomatic.git

diff --git a/src/wx/gain_calculator_dialog.cc b/src/wx/gain_calculator_dialog.cc
index 133d84c21..62708fd22 100644
--- a/src/wx/gain_calculator_dialog.cc
+++ b/src/wx/gain_calculator_dialog.cc
@@ -1,56 +1,72 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 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 <boost/lexical_cast.hpp>
 #include "gain_calculator_dialog.h"
 #include "wx_util.h"
+#include "lib/cinema_sound_processor.h"
+
+
+using boost::optional;
 
-using namespace boost;
 
 GainCalculatorDialog::GainCalculatorDialog (wxWindow* parent)
-	: TableDialog (parent, _("Gain Calculator"), 2, true)
+	: TableDialog (parent, _("Gain Calculator"), 2, 1, true)
 {
+	add (_("Sound processor"), true);
+	_processor = add (new wxChoice(this, wxID_ANY));
+
 	add (_("I want to play this back at fader"), true);
 	_wanted = add (new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, wxTextValidator (wxFILTER_NUMERIC)));
 
 	add (_("But I have to use fader"), true);
 	_actual = add (new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, wxTextValidator (wxFILTER_NUMERIC)));
 
-	layout ();
-}
-
-float
-GainCalculatorDialog::wanted_fader () const
-{
-	if (_wanted->GetValue().IsEmpty()) {
-		return 0;
+	for (auto i: CinemaSoundProcessor::all()) {
+		_processor->Append (std_to_wx(i->name()));
 	}
 
-	return lexical_cast<float> (wx_to_std (_wanted->GetValue ()));
+	_processor->SetSelection (0);
+
+	layout ();
 }
 
-float
-GainCalculatorDialog::actual_fader () const
+optional<float>
+GainCalculatorDialog::db_change () const
 {
-	if (_actual->GetValue().IsEmpty()) {
-		return 0;
+	if (_wanted->GetValue().IsEmpty() || _actual->GetValue().IsEmpty()) {
+		return {};
 	}
 
-	return lexical_cast<float> (wx_to_std (_actual->GetValue ()));
+	auto relaxed_string_to_float = [](std::string s) {
+		try {
+			boost::algorithm::replace_all(s, ",", ".");
+			return boost::lexical_cast<float>(s);
+		} catch (boost::bad_lexical_cast &) {
+			boost::algorithm::replace_all(s, ".", ",");
+			return boost::lexical_cast<float>(s);
+		}
+	};
+
+	return CinemaSoundProcessor::from_index(
+		_processor->GetSelection())->db_for_fader_change(
+			relaxed_string_to_float(wx_to_std(_wanted->GetValue())),
+			relaxed_string_to_float(wx_to_std(_actual->GetValue()))
+			);
 }