projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hide some warnings.
[dcpomatic.git]
/
src
/
wx
/
audio_gain_dialog.cc
diff --git
a/src/wx/audio_gain_dialog.cc
b/src/wx/audio_gain_dialog.cc
index 75a993d8c4df4b0a4006e24cc43de2f4de129b23..c16ec4cb660a6e320645a913992ec18cb8f56a6f 100644
(file)
--- a/
src/wx/audio_gain_dialog.cc
+++ b/
src/wx/audio_gain_dialog.cc
@@
-1,41
+1,50
@@
/*
/*
- 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.
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 <cmath>
-#include <wx/spinctrl.h>
+
#include "audio_gain_dialog.h"
#include "wx_util.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)
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);
{
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->SetDigits (1);
_gain->SetIncrement (0.1);
- _gain->SetValue (
20 * log10
(v));
+ _gain->SetValue (
linear_to_db
(v));
layout ();
layout ();
+
+ _gain->SetFocus ();
}
float
}
float
@@
-45,5
+54,5
@@
AudioGainDialog::value () const
return 0;
}
return 0;
}
- return
pow (10, _gain->GetValue () / 20
);
+ return
db_to_linear (_gain->GetValue()
);
}
}