X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_mapping_view.cc;h=8e92400bdb956ffd7b58205dccf5626bf9015be7;hb=0da7c88a1afb221f97e2e96c159b1a984e4e2f71;hp=9fa57a1b10b2f21dc0aa54674d1ea543e6284289;hpb=e8204f55c981493b99814f71a50b3c3d62601032;p=dcpomatic.git diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc index 9fa57a1b1..8e92400bd 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,21 @@ */ +/** @file src/wx/audio_mapping_view.cc + * @brief AudioMappingView class and helpers. + */ + #include #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; @@ -34,12 +40,12 @@ using std::max; using boost::shared_ptr; using boost::lexical_cast; -#define INDICATOR_SIZE 20 +#define INDICATOR_SIZE 16 enum { ID_off = 1, ID_full = 2, - ID_minus3dB = 3, + ID_minus6dB = 3, ID_edit = 4 }; @@ -52,6 +58,9 @@ public: } }; +/** @class ValueRenderer + * @brief wxGridCellRenderer for a gain value. + */ class ValueRenderer : public wxGridCellRenderer { public: @@ -109,7 +118,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 (); @@ -130,12 +139,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); } @@ -154,7 +163,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); @@ -180,28 +189,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) { @@ -229,7 +238,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); } } @@ -238,7 +247,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 (dcp::raw_convert (_map.get (i, static_cast (j - 1))))); } } @@ -266,7 +275,11 @@ AudioMappingView::set_column_labels () { int const c = _grid->GetNumberCols (); - _grid->SetColLabelValue (0, _("Content channel")); + _grid->SetColLabelValue (0, _("Content")); + +#if MAX_DCP_AUDIO_CHANNELS != 12 +#warning AudioMappingView::set_column_labels() is expecting the wrong MAX_DCP_AUDIO_CHANNELS +#endif if (c > 0) { _grid->SetColLabelValue (1, _("L")); @@ -292,6 +305,30 @@ AudioMappingView::set_column_labels () _grid->SetColLabelValue (6, _("Rs")); } + if (c > 6) { + _grid->SetColLabelValue (7, _("HI")); + } + + if (c > 7) { + _grid->SetColLabelValue (8, _("VI")); + } + + if (c > 8) { + _grid->SetColLabelValue (9, _("Lc")); + } + + if (c > 9) { + _grid->SetColLabelValue (10, _("Rc")); + } + + if (c > 10) { + _grid->SetColLabelValue (11, _("BsL")); + } + + if (c > 11) { + _grid->SetColLabelValue (12, _("BsR")); + } + _grid->AutoSize (); } @@ -314,7 +351,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) {