summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-06-03 14:36:00 +0100
committerCarl Hetherington <cth@carlh.net>2014-06-03 14:36:00 +0100
commit30c191768a0108edaf9bdf79febf1cc74ed73482 (patch)
treeacd02b1de9436fac225a15b1bd16959104bb4a5e /src
parentc5b3d91fab31fde4c21e1cc5bb5adb1d6d26fcca (diff)
Change the -3dB preset to -6dB since we are dealing with amplitude, not power.
Diffstat (limited to 'src')
-rw-r--r--src/wx/audio_mapping_view.cc10
-rw-r--r--src/wx/audio_mapping_view.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index c1f3e2067..d59c4ae07 100644
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -39,7 +39,7 @@ using boost::lexical_cast;
enum {
ID_off = 1,
ID_full = 2,
- ID_minus3dB = 3,
+ ID_minus6dB = 3,
ID_edit = 4
};
@@ -130,12 +130,12 @@ AudioMappingView::AudioMappingView (wxWindow* parent)
_menu = new wxMenu;
_menu->Append (ID_off, _("Off"));
_menu->Append (ID_full, _("Full"));
- _menu->Append (ID_minus3dB, _("-3dB"));
+ _menu->Append (ID_minus6dB, _("-6dB"));
_menu->Append (ID_edit, _("Edit..."));
Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&AudioMappingView::off, this), ID_off);
Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&AudioMappingView::full, this), ID_full);
- Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&AudioMappingView::minus3dB, this), ID_minus3dB);
+ Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&AudioMappingView::minus6dB, this), ID_minus6dB);
Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&AudioMappingView::edit, this), ID_edit);
}
@@ -192,9 +192,9 @@ AudioMappingView::full ()
}
void
-AudioMappingView::minus3dB ()
+AudioMappingView::minus6dB ()
{
- _map.set (_menu_row, static_cast<libdcp::Channel> (_menu_column - 1), 1 / sqrt (2));
+ _map.set (_menu_row, static_cast<libdcp::Channel> (_menu_column - 1), pow (10, -6.0 / 20));
map_changed ();
}
diff --git a/src/wx/audio_mapping_view.h b/src/wx/audio_mapping_view.h
index 26f1746e0..98375eb9e 100644
--- a/src/wx/audio_mapping_view.h
+++ b/src/wx/audio_mapping_view.h
@@ -42,7 +42,7 @@ private:
void off ();
void full ();
- void minus3dB ();
+ void minus6dB ();
void edit ();
wxGrid* _grid;