X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_gain_dialog.cc;h=c16ec4cb660a6e320645a913992ec18cb8f56a6f;hb=d5f5a9d9f5635f84a5e372181dea1c7cbb0ae732;hp=72b3f86ca94bc77f1aa551de9b66955b8395ecf7;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/wx/audio_gain_dialog.cc b/src/wx/audio_gain_dialog.cc
index 72b3f86ca..c16ec4cb6 100644
--- a/src/wx/audio_gain_dialog.cc
+++ b/src/wx/audio_gain_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,10 +18,16 @@
 
 */
 
-#include <cmath>
-#include <wx/spinctrl.h>
+
 #include "audio_gain_dialog.h"
 #include "wx_util.h"
+#include "lib/maths_util.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
+#include <wx/spinctrl.h>
+LIBDCP_ENABLE_WARNINGS
+#include <cmath>
+
 
 AudioGainDialog::AudioGainDialog (wxWindow* parent, int c, int d, float v)
 	: TableDialog (parent, _("Channel gain"), 3, 1, true)
@@ -30,13 +36,15 @@ AudioGainDialog::AudioGainDialog (wxWindow* parent, int c, int d, float v)
 	_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
@@ -46,5 +54,5 @@ AudioGainDialog::value () const
 		return 0;
 	}
 
-	return pow (10, _gain->GetValue () / 20);
+	return db_to_linear (_gain->GetValue());
 }