X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_mapping_view.cc;h=809b16bc862ee90af12d08e1b67041a0fb5df6bd;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=52303ac14b2e9b94996bbf8950f42e3bf4458abc;hpb=2e504b33eb9f38cac629ad31b7c107fb0cf5efda;p=dcpomatic.git diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc index 52303ac14..809b16bc8 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-2015 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,20 +17,27 @@ */ -#include -#include -#include -#include +/** @file src/wx/audio_mapping_view.cc + * @brief AudioMappingView class and helpers. + */ + #include "lib/audio_mapping.h" #include "lib/util.h" +#include "lib/raw_convert.h" #include "audio_mapping_view.h" #include "wx_util.h" #include "audio_gain_dialog.h" +#include +#include +#include +#include +#include using std::cout; using std::list; using std::string; using std::max; +using std::vector; using boost::shared_ptr; using boost::lexical_cast; @@ -39,7 +46,7 @@ using boost::lexical_cast; enum { ID_off = 1, ID_full = 2, - ID_minus3dB = 3, + ID_minus6dB = 3, ID_edit = 4 }; @@ -52,14 +59,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); @@ -80,7 +88,7 @@ public: } height = max (0, height); - + if (value > 0) { /* Make sure we get a little bit of the marker if there is any gain */ height = max (3, height); @@ -94,7 +102,7 @@ public: { return wxSize (INDICATOR_SIZE + 4, INDICATOR_SIZE + 4); } - + wxGridCellRenderer* Clone () const { return new ValueRenderer; @@ -111,15 +119,14 @@ 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 (); _grid->EnableEditing (false); _grid->SetCellHighlightPenWidth (0); _grid->SetDefaultRenderer (new NoSelectionStringRenderer); - - set_column_labels (); + _grid->AutoSize (); _sizer = new wxBoxSizer (wxVERTICAL); _sizer->Add (_grid, 1, wxEXPAND | wxALL); @@ -132,22 +139,23 @@ 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); } +/** Called when any gain value has changed */ void -AudioMappingView::map_changed () +AudioMappingView::map_values_changed () { update_cells (); Changed (_map); _last_tooltip_column = -1; -} +} void AudioMappingView::left_click (wxGridEvent& ev) @@ -156,15 +164,15 @@ AudioMappingView::left_click (wxGridEvent& ev) return; } - dcp::Channel d = static_cast (ev.GetCol() - 1); - + int const d = ev.GetCol() - 1; + if (_map.get (ev.GetRow(), d) > 0) { _map.set (ev.GetRow(), d, 0); } else { _map.set (ev.GetRow(), d, 1); } - map_changed (); + map_values_changed (); } void @@ -182,35 +190,35 @@ AudioMappingView::right_click (wxGridEvent& ev) void AudioMappingView::off () { - _map.set (_menu_row, static_cast (_menu_column - 1), 0); - map_changed (); + _map.set (_menu_row, _menu_column - 1, 0); + map_values_changed (); } void AudioMappingView::full () { - _map.set (_menu_row, static_cast (_menu_column - 1), 1); - map_changed (); + _map.set (_menu_row, _menu_column - 1, 1); + map_values_changed (); } void -AudioMappingView::minus3dB () +AudioMappingView::minus6dB () { - _map.set (_menu_row, static_cast (_menu_column - 1), 1 / sqrt (2)); - map_changed (); + _map.set (_menu_row, _menu_column - 1, pow (10, -6.0 / 20)); + map_values_changed (); } void AudioMappingView::edit () { - dcp::Channel d = static_cast (_menu_column - 1); - + int const d = _menu_column - 1; + AudioGainDialog* dialog = new AudioGainDialog (this, _menu_row, _menu_column - 1, _map.get (_menu_row, d)); if (dialog->ShowModal () == wxID_OK) { _map.set (_menu_row, d, dialog->value ()); - map_changed (); + map_values_changed (); } - + dialog->Destroy (); } @@ -222,106 +230,59 @@ AudioMappingView::set (AudioMapping map) } void -AudioMappingView::update_cells () +AudioMappingView::set_input_channels (vector const & names) { - LocaleGuard lg; - - if (_grid->GetNumberRows ()) { - _grid->DeleteRows (0, _grid->GetNumberRows ()); - } - - _grid->InsertRows (0, _map.content_channels ()); - - for (int i = 0; i < _map.content_channels(); ++i) { - for (int j = 0; j < MAX_AUDIO_CHANNELS; ++j) { - _grid->SetCellRenderer (i, j + 1, new ValueRenderer); - } + for (int i = 0; i < _grid->GetNumberRows(); ++i) { + _grid->SetCellValue (i, 0, std_to_wx (names[i])); } - - for (int i = 0; i < _map.content_channels(); ++i) { - _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->AutoSize (); } -/** @param c Number of DCP channels */ void -AudioMappingView::set_channels (int c) +AudioMappingView::set_output_channels (vector const & names) { - c++; + int const o = names.size() + 1; + if (o < _grid->GetNumberCols ()) { + _grid->DeleteCols (o, _grid->GetNumberCols() - o); + } else if (o > _grid->GetNumberCols ()) { + _grid->InsertCols (_grid->GetNumberCols(), o - _grid->GetNumberCols()); + } - if (c < _grid->GetNumberCols ()) { - _grid->DeleteCols (c, _grid->GetNumberCols() - c); - } else if (c > _grid->GetNumberCols ()) { - _grid->InsertCols (_grid->GetNumberCols(), c - _grid->GetNumberCols()); - set_column_labels (); + _grid->SetColLabelValue (0, _("Content")); + + for (size_t i = 0; i < names.size(); ++i) { + _grid->SetColLabelValue (i + 1, std_to_wx (names[i])); } update_cells (); } void -AudioMappingView::set_column_labels () +AudioMappingView::update_cells () { - int const c = _grid->GetNumberCols (); - - _grid->SetColLabelValue (0, _("Content")); - -#if MAX_AUDIO_CHANNELS != 12 -#warning AudioMappingView::set_column_labels() is expecting the wrong MAX_AUDIO_CHANNELS -#endif - - if (c > 0) { - _grid->SetColLabelValue (1, _("L")); - } - - if (c > 1) { - _grid->SetColLabelValue (2, _("R")); - } - - if (c > 2) { - _grid->SetColLabelValue (3, _("C")); - } - - if (c > 3) { - _grid->SetColLabelValue (4, _("Lfe")); - } - - if (c > 4) { - _grid->SetColLabelValue (5, _("Ls")); - } - - if (c > 5) { - _grid->SetColLabelValue (6, _("Rs")); + vector row_names; + for (int i = 0; i < _grid->GetNumberRows (); ++i) { + row_names.push_back (wx_to_std (_grid->GetCellValue (i, 0))); } - if (c > 6) { - _grid->SetColLabelValue (7, _("HI")); - } - - if (c > 7) { - _grid->SetColLabelValue (8, _("VI")); - } - - if (c > 8) { - _grid->SetColLabelValue (9, _("Lc")); + if (_grid->GetNumberRows ()) { + _grid->DeleteRows (0, _grid->GetNumberRows ()); } - if (c > 9) { - _grid->SetColLabelValue (10, _("Rc")); - } + _grid->InsertRows (0, _map.input_channels ()); - if (c > 10) { - _grid->SetColLabelValue (11, _("BsL")); + for (int i = 0; i < _map.input_channels(); ++i) { + for (int j = 0; j < _map.output_channels(); ++j) { + _grid->SetCellRenderer (i, j + 1, new ValueRenderer); + } } - if (c > 11) { - _grid->SetColLabelValue (12, _("BsR")); + for (int i = 0; i < _map.input_channels(); ++i) { + if (i < int (row_names.size ())) { + _grid->SetCellValue (i, 0, std_to_wx (row_names[i])); + } + for (int j = 1; j < _grid->GetNumberCols(); ++j) { + _grid->SetCellValue (i, j, std_to_wx (raw_convert (_map.get (i, j - 1)))); + } } _grid->AutoSize (); @@ -346,7 +307,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, 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) { @@ -355,7 +316,7 @@ AudioMappingView::mouse_moved (wxMouseEvent& ev) float const dB = 20 * log10 (gain); s = wxString::Format (_("Audio will be passed from content channel %d to DCP channel %d with gain %.1fdB."), row + 1, column, dB); } - + _grid->GetGridWindow()->SetToolTip (s + " " + _("Right click to change gain.")); _last_tooltip_row = row; _last_tooltip_column = column;