X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_mapping_view.cc;h=9e3ff787d93e7cf4b9c455c0fe99d1638815d59f;hb=refs%2Fheads%2Fvgtk3;hp=140f18d60341207cd03ad2bdc89a4999c32e4a56;hpb=e0b2ef3dbac6fc4900cad6fea4395c212578602b;p=dcpomatic.git diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc index 140f18d60..9e3ff787d 100644 --- a/src/wx/audio_mapping_view.cc +++ b/src/wx/audio_mapping_view.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2019 Carl Hetherington + Copyright (C) 2013-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -55,9 +55,10 @@ using dcp::locale_convert; enum { ID_off = 1, - ID_full = 2, - ID_minus6dB = 3, - ID_edit = 4 + ID_minus6dB = 2, + ID_0dB = 3, + ID_plus3dB = 4, + ID_edit = 5 }; AudioMappingView::AudioMappingView (wxWindow* parent, wxString left_label, wxString from, wxString top_label, wxString to) @@ -71,8 +72,9 @@ AudioMappingView::AudioMappingView (wxWindow* parent, wxString left_label, wxStr { _menu = new wxMenu; _menu->Append (ID_off, _("Off")); - _menu->Append (ID_full, _("Full")); _menu->Append (ID_minus6dB, _("-6dB")); + _menu->Append (ID_0dB, _("0dB (unchanged)")); + _menu->Append (ID_plus3dB, _("+3dB")); _menu->Append (ID_edit, _("Edit...")); _body = new wxPanel (this, wxID_ANY); @@ -84,9 +86,10 @@ AudioMappingView::AudioMappingView (wxWindow* parent, wxString left_label, wxStr #endif Bind (wxEVT_SIZE, boost::bind(&AudioMappingView::size, this, _1)); - Bind (wxEVT_MENU, boost::bind(&AudioMappingView::off, this), ID_off); - Bind (wxEVT_MENU, boost::bind(&AudioMappingView::full, this), ID_full); - Bind (wxEVT_MENU, boost::bind(&AudioMappingView::minus6dB, this), ID_minus6dB); + Bind (wxEVT_MENU, boost::bind(&AudioMappingView::set_gain_from_menu, this, 0), ID_off); + Bind (wxEVT_MENU, boost::bind(&AudioMappingView::set_gain_from_menu, this, db_to_linear(-6)), ID_minus6dB); + Bind (wxEVT_MENU, boost::bind(&AudioMappingView::set_gain_from_menu, this, 1), ID_0dB); + Bind (wxEVT_MENU, boost::bind(&AudioMappingView::set_gain_from_menu, this, db_to_linear(3)), ID_plus3dB); Bind (wxEVT_MENU, boost::bind(&AudioMappingView::edit, this), ID_edit); Bind (wxEVT_MOUSEWHEEL, boost::bind(&AudioMappingView::mouse_wheel, this, _1)); _body->Bind (wxEVT_PAINT, boost::bind(&AudioMappingView::paint, this)); @@ -156,9 +159,8 @@ AudioMappingView::scroll () } void -AudioMappingView::paint_static (wxDC& dc, wxGraphicsContext* gc) +AudioMappingView::paint_static (wxDC& dc) { - gc->SetAntialiasMode (wxANTIALIAS_DEFAULT); dc.SetFont (wxSWISS_FONT->Bold()); wxCoord label_width; wxCoord label_height; @@ -175,11 +177,10 @@ AudioMappingView::paint_static (wxDC& dc, wxGraphicsContext* gc) ); dc.SetFont (*wxSWISS_FONT); - gc->SetPen (*wxBLACK_PEN); } void -AudioMappingView::paint_column_labels (wxDC& dc, wxGraphicsContext* gc) +AudioMappingView::paint_column_labels (wxDC& dc) { wxCoord label_width; wxCoord label_height; @@ -190,33 +191,31 @@ AudioMappingView::paint_column_labels (wxDC& dc, wxGraphicsContext* gc) ++N; } - wxGraphicsPath lines = gc->CreatePath (); - lines.MoveToPoint (LEFT_WIDTH, GRID_SPACING); - lines.AddLineToPoint (LEFT_WIDTH + _output_channels.size() * GRID_SPACING, GRID_SPACING); - lines.MoveToPoint (LEFT_WIDTH, GRID_SPACING * 2); - lines.AddLineToPoint (LEFT_WIDTH + _output_channels.size() * GRID_SPACING, GRID_SPACING * 2); - gc->StrokePath (lines); + dc.DrawLine(wxPoint(LEFT_WIDTH, GRID_SPACING), wxPoint(LEFT_WIDTH + _output_channels.size() * GRID_SPACING, GRID_SPACING)); + dc.DrawLine(wxPoint(LEFT_WIDTH, GRID_SPACING * 2), wxPoint(LEFT_WIDTH + _output_channels.size() * GRID_SPACING, GRID_SPACING * 2)); } void -AudioMappingView::paint_column_lines (wxGraphicsContext* gc) +AudioMappingView::paint_column_lines (wxDC& dc) { - wxGraphicsPath lines = gc->CreatePath (); for (size_t i = 0; i < _output_channels.size(); ++i) { - lines.MoveToPoint (LEFT_WIDTH + GRID_SPACING * i, GRID_SPACING); - lines.AddLineToPoint (LEFT_WIDTH + GRID_SPACING * i, TOP_HEIGHT + _input_channels.size() * GRID_SPACING); + dc.DrawLine ( + wxPoint(LEFT_WIDTH + GRID_SPACING * i, GRID_SPACING), + wxPoint(LEFT_WIDTH + GRID_SPACING * i, TOP_HEIGHT + _input_channels.size() * GRID_SPACING) + ); } - lines.MoveToPoint (LEFT_WIDTH + GRID_SPACING * _output_channels.size(), GRID_SPACING); - lines.AddLineToPoint (LEFT_WIDTH + GRID_SPACING * _output_channels.size(), TOP_HEIGHT + _input_channels.size() * GRID_SPACING); - gc->StrokePath (lines); + + dc.DrawLine ( + wxPoint(LEFT_WIDTH + GRID_SPACING * _output_channels.size(), GRID_SPACING), + wxPoint(LEFT_WIDTH + GRID_SPACING * _output_channels.size(), TOP_HEIGHT + _input_channels.size() * GRID_SPACING) + ); } void -AudioMappingView::paint_row_labels (wxDC& dc, wxGraphicsContext* gc) +AudioMappingView::paint_row_labels (wxDC& dc) { wxCoord label_width; wxCoord label_height; - wxGraphicsPath lines = gc->CreatePath (); /* Row channel labels */ @@ -230,8 +229,10 @@ AudioMappingView::paint_row_labels (wxDC& dc, wxGraphicsContext* gc) /* Vertical lines on the left */ for (int i = 1; i < 3; ++i) { - lines.MoveToPoint (GRID_SPACING * i, TOP_HEIGHT); - lines.AddLineToPoint (GRID_SPACING * i, TOP_HEIGHT + _input_channels.size() * GRID_SPACING); + dc.DrawLine ( + wxPoint(GRID_SPACING * i, TOP_HEIGHT), + wxPoint(GRID_SPACING * i, TOP_HEIGHT + _input_channels.size() * GRID_SPACING) + ); } /* Group labels and lines */ @@ -250,44 +251,34 @@ AudioMappingView::paint_row_labels (wxDC& dc, wxGraphicsContext* gc) yp += dc.GetLogicalOrigin().y; } - wxCoord old_x, old_y, old_width, old_height; - dc.GetClippingBox (&old_x, &old_y, &old_width, &old_height); - dc.DestroyClippingRegion (); - dc.SetClippingRegion (GRID_SPACING, yp + 4, GRID_SPACING, height - 8); - dc.DrawRotatedText ( std_to_wx(i.name), GRID_SPACING + (GRID_SPACING - label_height) / 2, y + (height + label_width) / 2, 90 ); - - dc.DestroyClippingRegion (); - dc.SetClippingRegion (old_x, old_y, old_width, old_height); } - lines.MoveToPoint (GRID_SPACING, y); - lines.AddLineToPoint (GRID_SPACING * 2, y); + dc.DrawLine (wxPoint(GRID_SPACING, y), wxPoint(GRID_SPACING * 2, y)); y += height; } - lines.MoveToPoint (GRID_SPACING, y); - lines.AddLineToPoint (GRID_SPACING * 2, y); - - gc->StrokePath (lines); -} + dc.DrawLine (wxPoint(GRID_SPACING, y), wxPoint(GRID_SPACING * 2, y)); + } void -AudioMappingView::paint_row_lines (wxGraphicsContext* gc) +AudioMappingView::paint_row_lines (wxDC& dc) { - wxGraphicsPath lines = gc->CreatePath (); for (size_t i = 0; i < _input_channels.size(); ++i) { - lines.MoveToPoint (GRID_SPACING * 2, TOP_HEIGHT + GRID_SPACING * i); - lines.AddLineToPoint (LEFT_WIDTH + _output_channels.size() * GRID_SPACING, TOP_HEIGHT + GRID_SPACING * i); + dc.DrawLine ( + wxPoint(GRID_SPACING * 2, TOP_HEIGHT + GRID_SPACING * i), + wxPoint(LEFT_WIDTH + _output_channels.size() * GRID_SPACING, TOP_HEIGHT + GRID_SPACING * i) + ); } - lines.MoveToPoint (GRID_SPACING * 2, TOP_HEIGHT + GRID_SPACING * _input_channels.size()); - lines.AddLineToPoint (LEFT_WIDTH + _output_channels.size() * GRID_SPACING, TOP_HEIGHT + GRID_SPACING * _input_channels.size()); - gc->StrokePath (lines); + dc.DrawLine ( + wxPoint(GRID_SPACING * 2, TOP_HEIGHT + GRID_SPACING * _input_channels.size()), + wxPoint(LEFT_WIDTH + _output_channels.size() * GRID_SPACING, TOP_HEIGHT + GRID_SPACING * _input_channels.size()) + ); } void @@ -308,14 +299,15 @@ AudioMappingView::paint_indicators (wxDC& dc) ) ); - float const value_dB = 20 * log10 (_map.get(y, x)); + float const value_dB = linear_to_db(_map.get(y, x)); + wxColour const colour = value_dB <= 0 ? wxColour(0, 255, 0) : wxColour(255, 150, 0); int const range = 18; int height = 0; if (value_dB > -range) { - height = INDICATOR_SIZE * (1 + value_dB / range); + height = min(INDICATOR_SIZE, static_cast(INDICATOR_SIZE * (1 + value_dB / range))); } - dc.SetBrush (*wxTheBrushList->FindOrCreateBrush(wxColour (0, 255, 0), wxBRUSHSTYLE_SOLID)); + dc.SetBrush (*wxTheBrushList->FindOrCreateBrush(colour, wxBRUSHSTYLE_SOLID)); dc.DrawRectangle ( wxRect( LEFT_WIDTH + x * GRID_SPACING + (GRID_SPACING - INDICATOR_SIZE) / 2, @@ -328,27 +320,22 @@ AudioMappingView::paint_indicators (wxDC& dc) } static -void clip (wxDC& dc, wxGraphicsContext* gc, int x, int y, int w, int h) +void clip (wxDC& dc, int x, int y, int w, int h) { dc.SetClippingRegion (x, y, w, h); - gc->Clip (x, y, w, h); } static -void translate (wxDC& dc, wxGraphicsContext* gc, int x, int y) +void translate (wxDC& dc, int x, int y) { - gc->PushState (); - gc->Translate (-x, -y); dc.SetLogicalOrigin (x, y); } static -void restore (wxDC& dc, wxGraphicsContext* gc) +void restore (wxDC& dc) { dc.SetLogicalOrigin (0, 0); - gc->PopState (); dc.DestroyClippingRegion (); - gc->ResetClip (); } void @@ -356,42 +343,65 @@ AudioMappingView::paint () { wxPaintDC dc (_body); - wxGraphicsContext* gc = wxGraphicsContext::Create (dc); - if (!gc) { - return; - } - int const hs = _horizontal_scroll->GetThumbPosition (); int const vs = _vertical_scroll->GetThumbPosition (); - paint_static (dc, gc); - - clip (dc, gc, LEFT_WIDTH, 0, GRID_SPACING * _output_channels.size(), GRID_SPACING * (2 + _input_channels.size())); - translate (dc, gc, hs, 0); - paint_column_labels (dc, gc); - restore (dc, gc); - - clip (dc, gc, 0, TOP_HEIGHT, GRID_SPACING * (3 + _output_channels.size()), GRID_SPACING * _input_channels.size() + 1); - translate (dc, gc, 0, vs); - paint_row_labels (dc, gc); - restore (dc, gc); - - clip (dc, gc, GRID_SPACING * 2, TOP_HEIGHT, GRID_SPACING * (1 + _output_channels.size()), GRID_SPACING * _input_channels.size() + 1); - translate (dc, gc, hs, vs); - paint_row_lines (gc); - restore (dc, gc); - - clip (dc, gc, LEFT_WIDTH, GRID_SPACING, GRID_SPACING * (1 + _output_channels.size()), GRID_SPACING * (1 + _input_channels.size())); - translate (dc, gc, hs, vs); - paint_column_lines (gc); - restore (dc, gc); - - clip (dc, gc, LEFT_WIDTH, TOP_HEIGHT, GRID_SPACING * _output_channels.size(), GRID_SPACING * _input_channels.size()); - translate (dc, gc, hs, vs); + paint_static (dc); + + clip ( + dc, + LEFT_WIDTH, + 0, + GRID_SPACING * _output_channels.size(), + GRID_SPACING * (2 + _input_channels.size()) + ); + translate (dc, hs, 0); + paint_column_labels (dc); + restore (dc); + + clip ( + dc, + 0, + TOP_HEIGHT, + GRID_SPACING * 3, + min(int(GRID_SPACING * _input_channels.size()), GetSize().GetHeight() - TOP_HEIGHT) + ); + translate (dc, 0, vs); + paint_row_labels (dc); + restore (dc); + + clip ( + dc, + GRID_SPACING * 2, + TOP_HEIGHT, + GRID_SPACING * (1 + _output_channels.size()), + min(int(GRID_SPACING * (2 + _input_channels.size())), GetSize().GetHeight() - TOP_HEIGHT) + ); + translate (dc, hs, vs); + paint_row_lines (dc); + restore (dc); + + clip ( + dc, + LEFT_WIDTH, + GRID_SPACING, + GRID_SPACING * (1 + _output_channels.size()), + min(int(GRID_SPACING * (1 + _input_channels.size())), GetSize().GetHeight() - GRID_SPACING) + ); + translate (dc, hs, vs); + paint_column_lines (dc); + restore (dc); + + clip ( + dc, + LEFT_WIDTH, + TOP_HEIGHT, + GRID_SPACING * _output_channels.size(), + min(int(GRID_SPACING * _input_channels.size()), GetSize().GetHeight() - TOP_HEIGHT) + ); + translate (dc, hs, vs); paint_indicators (dc); - restore (dc, gc); - - delete gc; + restore (dc); } optional > @@ -488,23 +498,9 @@ AudioMappingView::map_values_changed () } void -AudioMappingView::off () -{ - _map.set (_menu_input, _menu_output, 0); - map_values_changed (); -} - -void -AudioMappingView::full () -{ - _map.set (_menu_input, _menu_output, 1); - map_values_changed (); -} - -void -AudioMappingView::minus6dB () +AudioMappingView::set_gain_from_menu (double linear) { - _map.set (_menu_input, _menu_output, pow (10, -6.0 / 20)); + _map.set (_menu_input, _menu_output, linear); map_values_changed (); } @@ -599,7 +595,7 @@ AudioMappingView::motion (wxMouseEvent& ev) safe_output_channel_name(channels->second) ); } else { - float const dB = 20 * log10 (gain); + float const dB = linear_to_db(gain); s = wxString::Format ( _("Audio will be passed from %s channel %s to %s channel %s with gain %.1fdB."), _from,