X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_gain_dialog.cc;h=fb9bd25447b4aba3ad9b01255ae5423d7e7389fb;hb=0e896f9f37db001f34c876ed5fc50e874f96ae09;hp=7622e443e279bddd0c8814c6314860930f4860eb;hpb=9314d6bdf8857bc6cd29b0596158f2d0ff787513;p=dcpomatic.git

diff --git a/src/wx/audio_gain_dialog.cc b/src/wx/audio_gain_dialog.cc
index 7622e443e..fb9bd2544 100644
--- a/src/wx/audio_gain_dialog.cc
+++ b/src/wx/audio_gain_dialog.cc
@@ -1,56 +1,45 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2020 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 <cmath>
-#include <wx/spinctrl.h>
 #include "audio_gain_dialog.h"
 #include "wx_util.h"
+#include "lib/util.h"
+#include <cmath>
+#include <wx/spinctrl.h>
 
 AudioGainDialog::AudioGainDialog (wxWindow* parent, int c, int d, float v)
-	: wxDialog (parent, wxID_ANY, _("Channel gain"))
+	: TableDialog (parent, _("Channel gain"), 3, 1, true)
 {
-	wxFlexGridSizer* table = new wxFlexGridSizer (3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-	table->AddGrowableCol (1, 1);
-
-	add_label_to_sizer (table, this, wxString::Format (_("Gain for content channel %d in DCP channel %d"), c + 1, d + 1), false);
-	_gain = new wxSpinCtrlDouble (this);
-	table->Add (_gain);
-
-	add_label_to_sizer (table, this, _("dB"), false);
+	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);
 
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	overall_sizer->Add (table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
-	
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
-	if (buttons) {
-		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
-	}
-
-	SetSizer (overall_sizer);
-	overall_sizer->Layout ();
-	overall_sizer->SetSizeHints (this);
-
-	_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
@@ -59,6 +48,6 @@ AudioGainDialog::value () const
 	if (_gain->GetValue() <= -144) {
 		return 0;
 	}
-	
-	return pow (10, _gain->GetValue () / 20);
+
+	return db_to_linear (_gain->GetValue());
 }