X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fgain_calculator_dialog.cc;h=8818aee9e3bd590591a33343b175d5063639069d;hb=49fc9b8c4282d0e973ac1f4e31357735cf6be218;hp=d49dfae70841acca22765d9c824bb53d0af83ab7;hpb=41b7a04cf3dedaa93aaf3c050db7a693281417f7;p=dcpomatic.git

diff --git a/src/wx/gain_calculator_dialog.cc b/src/wx/gain_calculator_dialog.cc
index d49dfae70..8818aee9e 100644
--- a/src/wx/gain_calculator_dialog.cc
+++ b/src/wx/gain_calculator_dialog.cc
@@ -1,30 +1,29 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 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"
-
-using namespace boost;
+#include "lib/util.h"
 
 GainCalculatorDialog::GainCalculatorDialog (wxWindow* parent)
-	: TableDialog (parent, _("Gain Calculator"), 2, true)
+	: TableDialog (parent, _("Gain Calculator"), 2, 1, true)
 {
 	add (_("I want to play this back at fader"), true);
 	_wanted = add (new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, wxTextValidator (wxFILTER_NUMERIC)));
@@ -41,8 +40,8 @@ GainCalculatorDialog::wanted_fader () const
 	if (_wanted->GetValue().IsEmpty()) {
 		return 0;
 	}
-	
-	return lexical_cast<float> (wx_to_std (_wanted->GetValue ()));
+
+	return relaxed_string_to_float (wx_to_std (_wanted->GetValue ()));
 }
 
 float
@@ -52,5 +51,5 @@ GainCalculatorDialog::actual_fader () const
 		return 0;
 	}
 
-	return lexical_cast<float> (wx_to_std (_actual->GetValue ()));
+	return relaxed_string_to_float (wx_to_std (_actual->GetValue ()));
 }