X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_gain_dialog.cc;h=2c0f17c0a5c6403d27895cd882ebe65db3b4d1a1;hb=cf2ed48d21ddbc32bda262064480e88e69dc031a;hp=75a993d8c4df4b0a4006e24cc43de2f4de129b23;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;p=dcpomatic.git diff --git a/src/wx/audio_gain_dialog.cc b/src/wx/audio_gain_dialog.cc index 75a993d8c..2c0f17c0a 100644 --- a/src/wx/audio_gain_dialog.cc +++ b/src/wx/audio_gain_dialog.cc @@ -1,41 +1,47 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-2020 Carl Hetherington - 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 . */ -#include -#include + #include "audio_gain_dialog.h" #include "wx_util.h" +#include "lib/maths_util.h" +#include +#include + AudioGainDialog::AudioGainDialog (wxWindow* parent, int c, int d, float v) - : TableDialog (parent, _("Channel gain"), 3, true) + : TableDialog (parent, _("Channel gain"), 3, 1, true) { add (wxString::Format (_("Gain for content channel %d in DCP channel %d"), c + 1, d + 1), false); _gain = add (new wxSpinCtrlDouble (this)); add (_("dB"), false); - _gain->SetRange (-144, 0); + _gain->SetRange (-144, 18); _gain->SetDigits (1); _gain->SetIncrement (0.1); - _gain->SetValue (20 * log10 (v)); + _gain->SetValue (linear_to_db(v)); layout (); + + _gain->SetFocus (); } float @@ -45,5 +51,5 @@ AudioGainDialog::value () const return 0; } - return pow (10, _gain->GetValue () / 20); + return db_to_linear (_gain->GetValue()); }