diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-04 12:33:41 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-04 12:33:41 +0100 |
| commit | 8102046b2f29e0c7b234c29bf204b056cb30e64f (patch) | |
| tree | 84933e8db7822e863ae9ab4e6524ab3176606b11 /src/wx/audio_mapping_view.cc | |
| parent | 3574212ee42b2bd924eb95d5c0f4f69ec9e0a2f0 (diff) | |
| parent | 82926443230084739cb673a83b2ab1f9d733a07b (diff) | |
Merge master.
Diffstat (limited to 'src/wx/audio_mapping_view.cc')
| -rw-r--r-- | src/wx/audio_mapping_view.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc index ac85407a2..c65eadd5a 100644 --- a/src/wx/audio_mapping_view.cc +++ b/src/wx/audio_mapping_view.cc @@ -44,7 +44,7 @@ using boost::lexical_cast; enum { ID_off = 1, ID_full = 2, - ID_minus3dB = 3, + ID_minus6dB = 3, ID_edit = 4 }; @@ -138,12 +138,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); } @@ -200,9 +200,9 @@ AudioMappingView::full () } void -AudioMappingView::minus3dB () +AudioMappingView::minus6dB () { - _map.set (_menu_row, static_cast<dcp::Channel> (_menu_column - 1), 1 / sqrt (2)); + _map.set (_menu_row, static_cast<dcp::Channel> (_menu_column - 1), pow (10, -6.0 / 20)); map_changed (); } |