projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op; fix GPL address and use the explicit-program-name version.
[dcpomatic.git]
/
src
/
wx
/
gain_calculator_dialog.cc
diff --git
a/src/wx/gain_calculator_dialog.cc
b/src/wx/gain_calculator_dialog.cc
index a840aebef4ad7a64f94691f3ed6461fe7bc45f1d..8818aee9e3bd590591a33343b175d5063639069d 100644
(file)
--- a/
src/wx/gain_calculator_dialog.cc
+++ b/
src/wx/gain_calculator_dialog.cc
@@
-1,27
+1,26
@@
/*
/*
- Copyright (C) 2012-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
6
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.
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
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 "gain_calculator_dialog.h"
#include "wx_util.h"
-
-using namespace boost;
+#include "lib/util.h"
GainCalculatorDialog::GainCalculatorDialog (wxWindow* parent)
: TableDialog (parent, _("Gain Calculator"), 2, 1, true)
GainCalculatorDialog::GainCalculatorDialog (wxWindow* parent)
: TableDialog (parent, _("Gain Calculator"), 2, 1, true)
@@
-42,7
+41,7
@@
GainCalculatorDialog::wanted_fader () const
return 0;
}
return 0;
}
- return
lexical_cast<float>
(wx_to_std (_wanted->GetValue ()));
+ return
relaxed_string_to_float
(wx_to_std (_wanted->GetValue ()));
}
float
}
float
@@
-52,5
+51,5
@@
GainCalculatorDialog::actual_fader () const
return 0;
}
return 0;
}
- return
lexical_cast<float>
(wx_to_std (_actual->GetValue ()));
+ return
relaxed_string_to_float
(wx_to_std (_actual->GetValue ()));
}
}