X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Faudio_mapping_view.cc;h=52303ac14b2e9b94996bbf8950f42e3bf4458abc;hp=859c4d54859c3243d89170cd164cb465c8aac339;hb=854f2e5bbb7ffb9758b823af87034033033f3cb8;hpb=2f848b51a4ac00f7f25691fad40841d066f867cc diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc index 859c4d548..52303ac14 100644 --- a/src/wx/audio_mapping_view.cc +++ b/src/wx/audio_mapping_view.cc @@ -20,26 +20,28 @@ #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" using std::cout; using std::list; +using std::string; +using std::max; using boost::shared_ptr; +using boost::lexical_cast; -/* This could go away with wxWidgets 2.9, which has an API call - to find these values. -*/ +#define INDICATOR_SIZE 16 -#ifdef __WXMSW__ -#define CHECKBOX_WIDTH 16 -#define CHECKBOX_HEIGHT 16 -#else -#define CHECKBOX_WIDTH 20 -#define CHECKBOX_HEIGHT 20 -#endif +enum { + ID_off = 1, + ID_full = 2, + ID_minus3dB = 3, + ID_edit = 4 +}; class NoSelectionStringRenderer : public wxGridCellStringRenderer { @@ -50,49 +52,67 @@ public: } }; -class CheckBoxRenderer : public wxGridCellRenderer +class ValueRenderer : public wxGridCellRenderer { public: void Draw (wxGrid& grid, wxGridCellAttr &, wxDC& dc, const wxRect& rect, int row, int col, bool) { -#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 9 - dc.SetPen (*wxThePenList->FindOrCreatePen (wxColour (255, 255, 255), 0, wxPENSTYLE_SOLID)); -#else - dc.SetPen (*wxThePenList->FindOrCreatePen (wxColour (255, 255, 255), 0, wxSOLID)); -#endif + 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); + + int const xo = (rect.GetWidth() - INDICATOR_SIZE) / 2; + int const yo = (rect.GetHeight() - INDICATOR_SIZE) / 2; + + dc.SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 1, wxPENSTYLE_SOLID)); + dc.SetBrush (*wxTheBrushList->FindOrCreateBrush (wxColour (255, 255, 255), wxBRUSHSTYLE_SOLID)); + dc.DrawRectangle (wxRect (rect.GetLeft() + xo, rect.GetTop() + yo, INDICATOR_SIZE, INDICATOR_SIZE)); + + float const value = lexical_cast (wx_to_std (grid.GetCellValue (row, col))); + float const value_dB = 20 * log10 (value); + int const range = 18; + int height = 0; + if (value_dB > -range) { + height = INDICATOR_SIZE * (1 + value_dB / range); + } + + height = max (0, height); - wxRendererNative::Get().DrawCheckBox ( - &grid, - dc, rect, - grid.GetCellValue (row, col) == wxT("1") ? static_cast(wxCONTROL_CHECKED) : 0 - ); + if (value > 0) { + /* Make sure we get a little bit of the marker if there is any gain */ + height = max (3, height); + } + + dc.SetBrush (*wxTheBrushList->FindOrCreateBrush (wxColour (0, 255, 0), wxBRUSHSTYLE_SOLID)); + dc.DrawRectangle (wxRect (rect.GetLeft() + xo, rect.GetTop() + yo + INDICATOR_SIZE - height, INDICATOR_SIZE, height)); } wxSize GetBestSize (wxGrid &, wxGridCellAttr &, wxDC &, int, int) { - return wxSize (CHECKBOX_WIDTH + 4, CHECKBOX_HEIGHT + 4); + return wxSize (INDICATOR_SIZE + 4, INDICATOR_SIZE + 4); } wxGridCellRenderer* Clone () const { - return new CheckBoxRenderer; + return new ValueRenderer; } }; AudioMappingView::AudioMappingView (wxWindow* parent) : wxPanel (parent, wxID_ANY) + , _menu_row (0) + , _menu_column (1) + , _last_tooltip_row (0) + , _last_tooltip_column (0) { _grid = new wxGrid (this, wxID_ANY); - _grid->CreateGrid (0, 7); -#if wxMINOR_VERSION == 9 + _grid->CreateGrid (0, MAX_AUDIO_CHANNELS + 1); _grid->HideRowLabels (); -#else - _grid->SetRowLabelSize (0); -#endif _grid->DisableDragRowSize (); _grid->DisableDragColSize (); _grid->EnableEditing (false); @@ -105,67 +125,131 @@ AudioMappingView::AudioMappingView (wxWindow* parent) _sizer->Add (_grid, 1, wxEXPAND | wxALL); SetSizerAndFit (_sizer); - Connect (wxID_ANY, wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler (AudioMappingView::left_click), 0, this); + Bind (wxEVT_GRID_CELL_LEFT_CLICK, boost::bind (&AudioMappingView::left_click, this, _1)); + Bind (wxEVT_GRID_CELL_RIGHT_CLICK, boost::bind (&AudioMappingView::right_click, this, _1)); + _grid->GetGridWindow()->Bind (wxEVT_MOTION, boost::bind (&AudioMappingView::mouse_moved, this, _1)); + + _menu = new wxMenu; + _menu->Append (ID_off, _("Off")); + _menu->Append (ID_full, _("Full")); + _menu->Append (ID_minus3dB, _("-3dB")); + _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::edit, this), ID_edit); } +void +AudioMappingView::map_changed () +{ + update_cells (); + Changed (_map); + _last_tooltip_column = -1; +} + void AudioMappingView::left_click (wxGridEvent& ev) { if (ev.GetCol() == 0) { return; } + + dcp::Channel d = static_cast (ev.GetCol() - 1); - if (_grid->GetCellValue (ev.GetRow(), ev.GetCol()) == wxT("1")) { - _grid->SetCellValue (ev.GetRow(), ev.GetCol(), wxT("0")); + if (_map.get (ev.GetRow(), d) > 0) { + _map.set (ev.GetRow(), d, 0); } else { - _grid->SetCellValue (ev.GetRow(), ev.GetCol(), wxT("1")); + _map.set (ev.GetRow(), d, 1); } - _map = AudioMapping (); - for (int i = 0; i < _grid->GetNumberRows(); ++i) { - for (int j = 1; j < _grid->GetNumberCols(); ++j) { - if (_grid->GetCellValue (i, j) == wxT ("1")) { - _map.add (i, static_cast (j - 1)); - } - } + map_changed (); +} + +void +AudioMappingView::right_click (wxGridEvent& ev) +{ + if (ev.GetCol() == 0) { + return; } - Changed (_map); + _menu_row = ev.GetRow (); + _menu_column = ev.GetCol (); + PopupMenu (_menu, ev.GetPosition ()); +} + +void +AudioMappingView::off () +{ + _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_changed (); +} + +void +AudioMappingView::minus3dB () +{ + _map.set (_menu_row, static_cast (_menu_column - 1), 1 / sqrt (2)); + map_changed (); +} + +void +AudioMappingView::edit () +{ + 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) { + _map.set (_menu_row, d, dialog->value ()); + map_changed (); + } + + dialog->Destroy (); } void AudioMappingView::set (AudioMapping map) { _map = map; + update_cells (); +} + +void +AudioMappingView::update_cells () +{ + LocaleGuard lg; if (_grid->GetNumberRows ()) { _grid->DeleteRows (0, _grid->GetNumberRows ()); } - list content_channels = _map.content_channels (); - _grid->InsertRows (0, content_channels.size ()); + _grid->InsertRows (0, _map.content_channels ()); - for (size_t r = 0; r < content_channels.size(); ++r) { - for (int c = 1; c < 7; ++c) { - _grid->SetCellRenderer (r, c, new CheckBoxRenderer); + 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); } } - int n = 0; - for (list::iterator i = content_channels.begin(); i != content_channels.end(); ++i) { - _grid->SetCellValue (n, 0, wxString::Format (wxT("%d"), *i + 1)); - - list const d = _map.content_to_dcp (*i); - for (list::const_iterator j = d.begin(); j != d.end(); ++j) { - int const c = static_cast(*j) + 1; - if (c < _grid->GetNumberCols ()) { - _grid->SetCellValue (n, c, wxT("1")); - } + 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))))); } - ++n; } + + _grid->AutoSize (); } +/** @param c Number of DCP channels */ void AudioMappingView::set_channels (int c) { @@ -178,7 +262,7 @@ AudioMappingView::set_channels (int c) set_column_labels (); } - set (_map); + update_cells (); } void @@ -186,7 +270,11 @@ AudioMappingView::set_column_labels () { int const c = _grid->GetNumberCols (); - _grid->SetColLabelValue (0, _("Content channel")); + _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")); @@ -212,5 +300,66 @@ 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 (); } + +void +AudioMappingView::mouse_moved (wxMouseEvent& ev) +{ + int xx; + int yy; + _grid->CalcUnscrolledPosition (ev.GetX(), ev.GetY(), &xx, &yy); + + int const row = _grid->YToRow (yy); + int const column = _grid->XToCol (xx); + + if (row < 0 || column < 1) { + _grid->GetGridWindow()->SetToolTip (""); + _last_tooltip_row = row; + _last_tooltip_column = column; + } + + if (row != _last_tooltip_row || column != _last_tooltip_column) { + + wxString s; + 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) { + s = wxString::Format (_("Audio will be passed from content channel %d to DCP channel %d unaltered."), row + 1, column); + } else { + 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; + } + + ev.Skip (); +}