X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_mapping_view.cc;h=c65eadd5a0676c9122ee968b8f902fe774a399ff;hb=8102046b2f29e0c7b234c29bf204b056cb30e64f;hp=7fdecb8d52a8dc9d3cee8ff54e8781b68b3ca422;hpb=bbd5444a9eb98b52136327dad0744b4c62a88ab2;p=dcpomatic.git diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc index 7fdecb8d5..c65eadd5a 100644 --- a/src/wx/audio_mapping_view.cc +++ b/src/wx/audio_mapping_view.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2014 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,15 +17,20 @@ */ +/** @file src/wx/audio_mapping_view.cc + * @brief AudioMappingView class and helpers. + */ + #include #include #include -#include +#include #include "lib/audio_mapping.h" #include "lib/util.h" #include "audio_mapping_view.h" #include "wx_util.h" #include "audio_gain_dialog.h" +#include using std::cout; using std::list; @@ -39,7 +44,7 @@ using boost::lexical_cast; enum { ID_off = 1, ID_full = 2, - ID_minus3dB = 3, + ID_minus6dB = 3, ID_edit = 4 }; @@ -52,14 +57,15 @@ public: } }; +/** @class ValueRenderer + * @brief wxGridCellRenderer for a gain value. + */ class ValueRenderer : public wxGridCellRenderer { public: void Draw (wxGrid& grid, wxGridCellAttr &, wxDC& dc, const wxRect& rect, int row, int col, bool) { - LocaleGuard lg; - dc.SetPen (*wxThePenList->FindOrCreatePen (wxColour (255, 255, 255), 1, wxPENSTYLE_SOLID)); dc.SetBrush (*wxTheBrushList->FindOrCreateBrush (wxColour (255, 255, 255), wxBRUSHSTYLE_SOLID)); dc.DrawRectangle (rect); @@ -111,7 +117,7 @@ AudioMappingView::AudioMappingView (wxWindow* parent) { _grid = new wxGrid (this, wxID_ANY); - _grid->CreateGrid (0, MAX_AUDIO_CHANNELS + 1); + _grid->CreateGrid (0, MAX_DCP_AUDIO_CHANNELS + 1); _grid->HideRowLabels (); _grid->DisableDragRowSize (); _grid->DisableDragColSize (); @@ -132,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); } @@ -156,7 +162,7 @@ AudioMappingView::left_click (wxGridEvent& ev) return; } - libdcp::Channel d = static_cast (ev.GetCol() - 1); + dcp::Channel d = static_cast (ev.GetCol() - 1); if (_map.get (ev.GetRow(), d) > 0) { _map.set (ev.GetRow(), d, 0); @@ -182,28 +188,28 @@ AudioMappingView::right_click (wxGridEvent& ev) void AudioMappingView::off () { - _map.set (_menu_row, static_cast (_menu_column - 1), 0); + _map.set (_menu_row, static_cast (_menu_column - 1), 0); map_changed (); } void AudioMappingView::full () { - _map.set (_menu_row, static_cast (_menu_column - 1), 1); + _map.set (_menu_row, static_cast (_menu_column - 1), 1); map_changed (); } void -AudioMappingView::minus3dB () +AudioMappingView::minus6dB () { - _map.set (_menu_row, static_cast (_menu_column - 1), 1 / sqrt (2)); + _map.set (_menu_row, static_cast (_menu_column - 1), pow (10, -6.0 / 20)); map_changed (); } void AudioMappingView::edit () { - libdcp::Channel d = static_cast (_menu_column - 1); + dcp::Channel d = static_cast (_menu_column - 1); AudioGainDialog* dialog = new AudioGainDialog (this, _menu_row, _menu_column - 1, _map.get (_menu_row, d)); if (dialog->ShowModal () == wxID_OK) { @@ -224,8 +230,6 @@ AudioMappingView::set (AudioMapping map) void AudioMappingView::update_cells () { - LocaleGuard lg; - if (_grid->GetNumberRows ()) { _grid->DeleteRows (0, _grid->GetNumberRows ()); } @@ -233,7 +237,7 @@ AudioMappingView::update_cells () _grid->InsertRows (0, _map.content_channels ()); for (int i = 0; i < _map.content_channels(); ++i) { - for (int j = 0; j < MAX_AUDIO_CHANNELS; ++j) { + for (int j = 0; j < MAX_DCP_AUDIO_CHANNELS; ++j) { _grid->SetCellRenderer (i, j + 1, new ValueRenderer); } } @@ -242,7 +246,7 @@ AudioMappingView::update_cells () _grid->SetCellValue (i, 0, wxString::Format (wxT("%d"), i + 1)); for (int j = 1; j < _grid->GetNumberCols(); ++j) { - _grid->SetCellValue (i, j, std_to_wx (lexical_cast (_map.get (i, static_cast (j - 1))))); + _grid->SetCellValue (i, j, std_to_wx (lexical_cast (_map.get (i, static_cast (j - 1))))); } } @@ -272,8 +276,8 @@ AudioMappingView::set_column_labels () _grid->SetColLabelValue (0, _("Content")); -#if MAX_AUDIO_CHANNELS != 12 -#warning AudioMappingView::set_column_labels() is expecting the wrong MAX_AUDIO_CHANNELS +#if MAX_DCP_AUDIO_CHANNELS != 12 +#warning AudioMappingView::set_column_labels() is expecting the wrong MAX_DCP_AUDIO_CHANNELS #endif if (c > 0) { @@ -346,7 +350,7 @@ AudioMappingView::mouse_moved (wxMouseEvent& ev) if (row != _last_tooltip_row || column != _last_tooltip_column) { wxString s; - float const gain = _map.get (row, static_cast (column - 1)); + float const gain = _map.get (row, static_cast (column - 1)); if (gain == 0) { s = wxString::Format (_("No audio will be passed from content channel %d to DCP channel %d."), row + 1, column); } else if (gain == 1) {