X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Faudio_mapping_view.cc;h=04a468416a75cc8ede8977621b14b1cd464e5c90;hp=1d9c085355f6a38f7ac27dfc1894256abb7381b6;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hpb=03b9ef36942b2d3e0b2054f465bcbe8e029069b2 diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc index 1d9c08535..04a468416 100644 --- a/src/wx/audio_mapping_view.cc +++ b/src/wx/audio_mapping_view.cc @@ -27,12 +27,15 @@ #include "audio_gain_dialog.h" #include "lib/audio_mapping.h" #include "lib/util.h" +#include "lib/warnings.h" #include #include +DCPOMATIC_DISABLE_WARNINGS #include #include #include #include +DCPOMATIC_ENABLE_WARNINGS #include #include @@ -44,8 +47,11 @@ using std::max; using std::vector; using std::pair; using std::make_pair; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using dcp::locale_convert; #define INDICATOR_SIZE 20 @@ -159,9 +165,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; @@ -178,63 +183,62 @@ 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; int N = 0; - BOOST_FOREACH (string i, _output_channels) { - dc.GetTextExtent (std_to_wx(i), &label_width, &label_height); - dc.DrawText (std_to_wx(i), LEFT_WIDTH + GRID_SPACING * N + (GRID_SPACING - label_width) / 2, GRID_SPACING + (GRID_SPACING - label_height) / 2); + BOOST_FOREACH (NamedChannel const& i, _output_channels) { + dc.GetTextExtent (std_to_wx(i.name), &label_width, &label_height); + dc.DrawText (std_to_wx(i.name), LEFT_WIDTH + GRID_SPACING * N + (GRID_SPACING - label_width) / 2, GRID_SPACING + (GRID_SPACING - label_height) / 2); ++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 */ int N = 0; - BOOST_FOREACH (string i, _input_channels) { - dc.GetTextExtent (std_to_wx(i), &label_width, &label_height); - dc.DrawText (std_to_wx(i), GRID_SPACING * 2 + (GRID_SPACING - label_width) / 2, TOP_HEIGHT + GRID_SPACING * N + (GRID_SPACING - label_height) / 2); + BOOST_FOREACH (NamedChannel const& i, _input_channels) { + dc.GetTextExtent (std_to_wx(i.name), &label_width, &label_height); + dc.DrawText (std_to_wx(i.name), GRID_SPACING * 2 + (GRID_SPACING - label_width) / 2, TOP_HEIGHT + GRID_SPACING * N + (GRID_SPACING - label_height) / 2); ++N; } /* 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 */ @@ -248,49 +252,40 @@ AudioMappingView::paint_row_labels (wxDC& dc, wxGraphicsContext* gc) } { + wxDCClipper clip (dc, wxRect(GRID_SPACING, y, GRID_SPACING, height)); int yp = y; if ((yp - 2 * GRID_SPACING) < dc.GetLogicalOrigin().y) { 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 @@ -311,7 +306,7 @@ AudioMappingView::paint_indicators (wxDC& dc) ) ); - float const value_dB = linear_to_db(_map.get(y, x)); + float const value_dB = linear_to_db(_map.get(_input_channels[y].index, _output_channels[x].index)); wxColour const colour = value_dB <= 0 ? wxColour(0, 255, 0) : wxColour(255, 150, 0); int const range = 18; int height = 0; @@ -332,27 +327,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 @@ -360,62 +350,85 @@ 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 > +optional > AudioMappingView::mouse_event_to_channels (wxMouseEvent& ev) const { int const x = ev.GetX() + _horizontal_scroll->GetThumbPosition(); int const y = ev.GetY() + _vertical_scroll->GetThumbPosition(); if (x <= LEFT_WIDTH || y < TOP_HEIGHT) { - return optional >(); + return optional >(); } int const input = (y - TOP_HEIGHT) / GRID_SPACING; int const output = (x - LEFT_WIDTH) / GRID_SPACING; if (input >= int(_input_channels.size()) || output >= int(_output_channels.size())) { - return optional >(); + return optional >(); } - return make_pair (input, output); + return make_pair (_input_channels[input], _output_channels[output]); } optional @@ -439,15 +452,15 @@ AudioMappingView::mouse_event_to_input_group_name (wxMouseEvent& ev) const void AudioMappingView::left_down (wxMouseEvent& ev) { - optional > channels = mouse_event_to_channels (ev); + optional > channels = mouse_event_to_channels (ev); if (!channels) { return; } - if (_map.get(channels->first, channels->second) > 0) { - _map.set (channels->first, channels->second, 0); + if (_map.get(channels->first.index, channels->second.index) > 0) { + _map.set (channels->first.index, channels->second.index, 0); } else { - _map.set (channels->first, channels->second, 1); + _map.set (channels->first.index, channels->second.index, 1); } map_values_changed (); @@ -456,13 +469,13 @@ AudioMappingView::left_down (wxMouseEvent& ev) void AudioMappingView::right_down (wxMouseEvent& ev) { - optional > channels = mouse_event_to_channels (ev); + optional > channels = mouse_event_to_channels (ev); if (!channels) { return; } - _menu_input = channels->first; - _menu_output = channels->second; + _menu_input = channels->first.index; + _menu_output = channels->second.index; PopupMenu (_menu, ev.GetPosition()); } @@ -487,7 +500,7 @@ void AudioMappingView::map_values_changed () { Changed (_map); - _last_tooltip_channels = optional >(); + _last_tooltip_channels = optional >(); Refresh (); } @@ -518,84 +531,72 @@ AudioMappingView::set (AudioMapping map) } void -AudioMappingView::set_input_channels (vector const & names) +AudioMappingView::set_input_channels (vector const& channels) { - _input_channels = names; + _input_channels = channels; setup (); Refresh (); } void -AudioMappingView::set_output_channels (vector const & names) +AudioMappingView::set_output_channels (vector const & channels) { - _output_channels = names; + _output_channels = channels; setup (); Refresh (); } + wxString -AudioMappingView::safe_input_channel_name (int n) const +AudioMappingView::input_channel_name_with_group (NamedChannel const& n) const { - if (n >= int(_input_channels.size())) { - return wxString::Format ("%d", n + 1); - } - optional group; BOOST_FOREACH (Group i, _input_groups) { - if (i.from <= n && n <= i.to) { + if (i.from <= n.index && n.index <= i.to) { group = std_to_wx (i.name); } } if (group && !group->IsEmpty()) { - return wxString::Format ("%s/%s", group->data(), std_to_wx(_input_channels[n]).data()); + return wxString::Format ("%s/%s", group->data(), std_to_wx(n.name).data()); } - return std_to_wx(_input_channels[n]); + return std_to_wx(n.name); } -wxString -AudioMappingView::safe_output_channel_name (int n) const -{ - if (n >= int(_output_channels.size())) { - return wxString::Format ("%d", n + 1); - } - - return std_to_wx(_output_channels[n]); -} void AudioMappingView::motion (wxMouseEvent& ev) { - optional > channels = mouse_event_to_channels (ev); + optional > channels = mouse_event_to_channels (ev); if (channels) { if (channels != _last_tooltip_channels) { wxString s; - float const gain = _map.get(channels->first, channels->second); + float const gain = _map.get(channels->first.index, channels->second.index); if (gain == 0) { s = wxString::Format ( _("No audio will be passed from %s channel '%s' to %s channel '%s'."), _from, - safe_input_channel_name(channels->first), + input_channel_name_with_group(channels->first), _to, - safe_output_channel_name(channels->second) + std_to_wx(channels->second.name) ); } else if (gain == 1) { s = wxString::Format ( _("Audio will be passed from %s channel %s to %s channel %s unaltered."), _from, - safe_input_channel_name(channels->first), + input_channel_name_with_group(channels->first), _to, - safe_output_channel_name(channels->second) + std_to_wx(channels->second.name) ); } else { 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, - safe_input_channel_name(channels->first), + input_channel_name_with_group(channels->first), _to, - safe_output_channel_name(channels->second), + std_to_wx(channels->second.name), dB ); }