X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_mapping_view.cc;h=6f4a39b1edac3af60e6f6df6d1b642192077570c;hb=e87f943433216d294b22853411eca5c582be1066;hp=04a468416a75cc8ede8977621b14b1cd464e5c90;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc index 04a468416..6f4a39b1e 100644 --- a/src/wx/audio_mapping_view.cc +++ b/src/wx/audio_mapping_view.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2020 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,46 +18,49 @@ */ + /** @file src/wx/audio_mapping_view.cc * @brief AudioMappingView class and helpers. */ + +#include "audio_gain_dialog.h" #include "audio_mapping_view.h" #include "wx_util.h" -#include "audio_gain_dialog.h" #include "lib/audio_mapping.h" -#include "lib/util.h" -#include "lib/warnings.h" +#include "lib/maths_util.h" #include #include -DCPOMATIC_DISABLE_WARNINGS -#include -#include -#include +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS -#include -#include +#include +#include +#include +LIBDCP_ENABLE_WARNINGS + -using std::cout; using std::list; -using std::string; -using std::min; +using std::make_pair; using std::max; -using std::vector; +using std::min; using std::pair; -using std::make_pair; using std::shared_ptr; +using std::string; +using std::vector; using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif using dcp::locale_convert; -#define INDICATOR_SIZE 20 -#define GRID_SPACING 32 -#define LEFT_WIDTH (GRID_SPACING * 3) -#define TOP_HEIGHT (GRID_SPACING * 2) + +static constexpr auto INDICATOR_SIZE = 20; +static constexpr auto ROW_HEIGHT = 32; +static constexpr auto MINIMUM_COLUMN_WIDTH = 32; +static constexpr auto TOP_HEIGHT = ROW_HEIGHT * 2; +static constexpr auto COLUMN_PADDING = 16; + enum { ID_off = 1, @@ -67,6 +70,7 @@ enum { ID_edit = 5 }; + AudioMappingView::AudioMappingView (wxWindow* parent, wxString left_label, wxString from, wxString top_label, wxString to) : wxPanel (parent, wxID_ANY) , _menu_input (0) @@ -83,86 +87,44 @@ AudioMappingView::AudioMappingView (wxWindow* parent, wxString left_label, wxStr _menu->Append (ID_plus3dB, _("+3dB")); _menu->Append (ID_edit, _("Edit...")); - _body = new wxPanel (this, wxID_ANY); - _vertical_scroll = new wxScrollBar (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSB_VERTICAL); - _horizontal_scroll = new wxScrollBar (this, wxID_ANY); - #ifndef __WXOSX__ SetDoubleBuffered (true); #endif - Bind (wxEVT_SIZE, boost::bind(&AudioMappingView::size, this, _1)); 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)); - _body->Bind (wxEVT_LEFT_DOWN, boost::bind(&AudioMappingView::left_down, this, _1)); - _body->Bind (wxEVT_RIGHT_DOWN, boost::bind(&AudioMappingView::right_down, this, _1)); - _body->Bind (wxEVT_MOTION, boost::bind(&AudioMappingView::motion, this, _1)); - _vertical_scroll->Bind (wxEVT_SCROLL_TOP, boost::bind(&AudioMappingView::scroll, this)); - _vertical_scroll->Bind (wxEVT_SCROLL_BOTTOM, boost::bind(&AudioMappingView::scroll, this)); - _vertical_scroll->Bind (wxEVT_SCROLL_LINEUP, boost::bind(&AudioMappingView::scroll, this)); - _vertical_scroll->Bind (wxEVT_SCROLL_LINEDOWN, boost::bind(&AudioMappingView::scroll, this)); - _vertical_scroll->Bind (wxEVT_SCROLL_PAGEUP, boost::bind(&AudioMappingView::scroll, this)); - _vertical_scroll->Bind (wxEVT_SCROLL_PAGEDOWN, boost::bind(&AudioMappingView::scroll, this)); - _vertical_scroll->Bind (wxEVT_SCROLL_THUMBTRACK, boost::bind(&AudioMappingView::scroll, this)); - _vertical_scroll->Bind (wxEVT_SCROLL_THUMBRELEASE, boost::bind(&AudioMappingView::scroll, this)); - _horizontal_scroll->Bind (wxEVT_SCROLL_TOP, boost::bind(&AudioMappingView::scroll, this)); - _horizontal_scroll->Bind (wxEVT_SCROLL_BOTTOM, boost::bind(&AudioMappingView::scroll, this)); - _horizontal_scroll->Bind (wxEVT_SCROLL_LINEUP, boost::bind(&AudioMappingView::scroll, this)); - _horizontal_scroll->Bind (wxEVT_SCROLL_LINEDOWN, boost::bind(&AudioMappingView::scroll, this)); - _horizontal_scroll->Bind (wxEVT_SCROLL_PAGEUP, boost::bind(&AudioMappingView::scroll, this)); - _horizontal_scroll->Bind (wxEVT_SCROLL_PAGEDOWN, boost::bind(&AudioMappingView::scroll, this)); - _horizontal_scroll->Bind (wxEVT_SCROLL_THUMBTRACK, boost::bind(&AudioMappingView::scroll, this)); - _horizontal_scroll->Bind (wxEVT_SCROLL_THUMBRELEASE, boost::bind(&AudioMappingView::scroll, this)); + Bind (wxEVT_PAINT, boost::bind(&AudioMappingView::paint, this)); + Bind (wxEVT_LEFT_DOWN, boost::bind(&AudioMappingView::left_down, this, _1)); + Bind (wxEVT_RIGHT_DOWN, boost::bind(&AudioMappingView::right_down, this, _1)); + Bind (wxEVT_MOTION, boost::bind(&AudioMappingView::motion, this, _1)); } -void -AudioMappingView::size (wxSizeEvent& ev) -{ - setup (); - ev.Skip (); -} void AudioMappingView::setup () { - wxSize const s = GetSize(); - int const w = _vertical_scroll->GetSize().GetWidth(); - int const h = _horizontal_scroll->GetSize().GetHeight(); - - _vertical_scroll->SetPosition (wxPoint(s.GetWidth() - w, 0)); - _vertical_scroll->SetSize (wxSize(w, max(0, s.GetHeight() - h))); - - _body->SetSize (wxSize(max(0, s.GetWidth() - w), max(0, s.GetHeight() - h))); - - _horizontal_scroll->SetPosition (wxPoint(0, s.GetHeight() - h)); - _horizontal_scroll->SetSize (wxSize(max(0, s.GetWidth() - w), h)); + wxClientDC dc (GetParent()); + dc.SetFont (wxSWISS_FONT->Bold()); - _vertical_scroll->SetScrollbar ( - _vertical_scroll->GetThumbPosition(), - s.GetHeight() - h - 8, - GRID_SPACING * (2 + _input_channels.size()), - GRID_SPACING, - true - ); + _column_widths.clear (); + _column_widths.reserve (_output_channels.size()); + _column_widths_total = 0; + + for (auto const& i: _output_channels) { + wxCoord width; + wxCoord height; + dc.GetTextExtent (std_to_wx(i.name), &width, &height); + auto const this_width = max(width + COLUMN_PADDING, MINIMUM_COLUMN_WIDTH); + _column_widths.push_back (this_width); + _column_widths_total += this_width; + } - _horizontal_scroll->SetScrollbar ( - _horizontal_scroll->GetThumbPosition(), - s.GetWidth() - w - 8, - GRID_SPACING * (3 + _output_channels.size()), - GRID_SPACING, - true); + SetMinSize({8 + left_width() + _column_widths_total, static_cast(8 + TOP_HEIGHT + ROW_HEIGHT * _input_channels.size())}); } -void -AudioMappingView::scroll () -{ - Refresh (); -} void AudioMappingView::paint_static (wxDC& dc) @@ -172,51 +134,57 @@ AudioMappingView::paint_static (wxDC& dc) wxCoord label_height; dc.GetTextExtent (_top_label, &label_width, &label_height); - dc.DrawText (_top_label, LEFT_WIDTH + (_output_channels.size() * GRID_SPACING - label_width) / 2, (GRID_SPACING - label_height) / 2); + dc.DrawText (_top_label, left_width() + (_column_widths_total - label_width) / 2, (ROW_HEIGHT - label_height) / 2); dc.GetTextExtent (_left_label, &label_width, &label_height); dc.DrawRotatedText ( _left_label, - (GRID_SPACING - label_height) / 2, - TOP_HEIGHT + (_input_channels.size() * GRID_SPACING + label_width) / 2, + (ROW_HEIGHT - label_height) / 2, + TOP_HEIGHT + (_input_channels.size() * ROW_HEIGHT + label_width) / 2, 90 ); dc.SetFont (*wxSWISS_FONT); } + void AudioMappingView::paint_column_labels (wxDC& dc) { wxCoord label_width; wxCoord label_height; - int N = 0; - 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; + int x = left_width(); + for (auto i = 0U; i < _output_channels.size(); ++i) { + auto const name = std_to_wx(_output_channels[i].name); + dc.GetTextExtent (name, &label_width, &label_height); + dc.DrawText (name, x + (_column_widths[i] - label_width) / 2, ROW_HEIGHT + (ROW_HEIGHT - label_height) / 2); + x += _column_widths[i]; } - 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)); + dc.DrawLine(wxPoint(left_width(), ROW_HEIGHT), wxPoint(left_width() + _column_widths_total, ROW_HEIGHT)); + dc.DrawLine(wxPoint(left_width(), ROW_HEIGHT * 2), wxPoint(left_width() + _column_widths_total, ROW_HEIGHT * 2)); } + void AudioMappingView::paint_column_lines (wxDC& dc) { + int x = left_width(); for (size_t i = 0; i < _output_channels.size(); ++i) { dc.DrawLine ( - wxPoint(LEFT_WIDTH + GRID_SPACING * i, GRID_SPACING), - wxPoint(LEFT_WIDTH + GRID_SPACING * i, TOP_HEIGHT + _input_channels.size() * GRID_SPACING) + wxPoint(x, ROW_HEIGHT), + wxPoint(x, TOP_HEIGHT + _input_channels.size() * ROW_HEIGHT) ); + x += _column_widths[i]; } 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) + wxPoint(left_width() + _column_widths_total, ROW_HEIGHT), + wxPoint(left_width() + _column_widths_total, TOP_HEIGHT + _input_channels.size() * ROW_HEIGHT) ); } + void AudioMappingView::paint_row_labels (wxDC& dc) { @@ -225,69 +193,76 @@ AudioMappingView::paint_row_labels (wxDC& dc) /* Row channel labels */ - int N = 0; - 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; + for (auto i = 0U; i < _input_channels.size(); ++i) { + auto const name = std_to_wx(_input_channels[i].name); + dc.GetTextExtent (name, &label_width, &label_height); + dc.DrawText (name, left_width() - MINIMUM_COLUMN_WIDTH + (MINIMUM_COLUMN_WIDTH - label_width) / 2, TOP_HEIGHT + ROW_HEIGHT * i + (ROW_HEIGHT - label_height) / 2); } /* Vertical lines on the left */ for (int i = 1; i < 3; ++i) { dc.DrawLine ( - wxPoint(GRID_SPACING * i, TOP_HEIGHT), - wxPoint(GRID_SPACING * i, TOP_HEIGHT + _input_channels.size() * GRID_SPACING) + wxPoint(MINIMUM_COLUMN_WIDTH * i, TOP_HEIGHT), + wxPoint(MINIMUM_COLUMN_WIDTH * i, TOP_HEIGHT + _input_channels.size() * ROW_HEIGHT) ); } - /* Group labels and lines */ - int y = TOP_HEIGHT; - BOOST_FOREACH (Group i, _input_groups) { - int const height = (i.to - i.from + 1) * GRID_SPACING; + for (auto const& i: _input_groups) { + dc.DrawLine (wxPoint(MINIMUM_COLUMN_WIDTH, y), wxPoint(MINIMUM_COLUMN_WIDTH * 2, y)); + y += (i.to - i.from + 1) * ROW_HEIGHT; + } + dc.DrawLine (wxPoint(MINIMUM_COLUMN_WIDTH, y), wxPoint(MINIMUM_COLUMN_WIDTH * 2, y)); + + if (_input_groups.empty()) { + auto const bottom = TOP_HEIGHT + _input_channels.size() * ROW_HEIGHT; + dc.DrawLine(wxPoint(MINIMUM_COLUMN_WIDTH, bottom), wxPoint(MINIMUM_COLUMN_WIDTH * 2, bottom)); + } + + /* Group labels and lines; be careful here as wxDCClipper does not restore the old + * clipping rectangle after it is destroyed + */ + y = TOP_HEIGHT; + for (auto const& i: _input_groups) { + int const height = (i.to - i.from + 1) * ROW_HEIGHT; dc.GetTextExtent (std_to_wx(i.name), &label_width, &label_height); if (label_width > height) { label_width = height - 8; } { - wxDCClipper clip (dc, wxRect(GRID_SPACING, y, GRID_SPACING, height)); + wxDCClipper clip (dc, wxRect(MINIMUM_COLUMN_WIDTH, y, ROW_HEIGHT, height)); int yp = y; - if ((yp - 2 * GRID_SPACING) < dc.GetLogicalOrigin().y) { + if ((yp - 2 * ROW_HEIGHT) < dc.GetLogicalOrigin().y) { yp += dc.GetLogicalOrigin().y; } dc.DrawRotatedText ( std_to_wx(i.name), - GRID_SPACING + (GRID_SPACING - label_height) / 2, + ROW_HEIGHT + (ROW_HEIGHT - label_height) / 2, y + (height + label_width) / 2, 90 ); } - dc.DrawLine (wxPoint(GRID_SPACING, y), wxPoint(GRID_SPACING * 2, y)); y += height; } - - dc.DrawLine (wxPoint(GRID_SPACING, y), wxPoint(GRID_SPACING * 2, y)); } + void AudioMappingView::paint_row_lines (wxDC& dc) { - for (size_t i = 0; i < _input_channels.size(); ++i) { + for (size_t i = 0; i < _input_channels.size() + 1; ++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) + wxPoint(MINIMUM_COLUMN_WIDTH * 2, TOP_HEIGHT + ROW_HEIGHT * i), + wxPoint(left_width() + _column_widths_total, TOP_HEIGHT + ROW_HEIGHT * i) ); } - 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 AudioMappingView::paint_indicators (wxDC& dc) { @@ -295,19 +270,20 @@ AudioMappingView::paint_indicators (wxDC& dc) size_t const output = min(_output_channels.size(), size_t(_map.output_channels())); size_t const input = min(_input_channels.size(), size_t(_map.input_channels())); + int xp = left_width(); for (size_t x = 0; x < output; ++x) { for (size_t y = 0; y < input; ++y) { dc.SetBrush (*wxWHITE_BRUSH); dc.DrawRectangle ( wxRect( - LEFT_WIDTH + x * GRID_SPACING + (GRID_SPACING - INDICATOR_SIZE) / 2, - TOP_HEIGHT + y * GRID_SPACING + (GRID_SPACING - INDICATOR_SIZE) / 2, + xp + (_column_widths[x] - INDICATOR_SIZE) / 2, + TOP_HEIGHT + y * ROW_HEIGHT + (ROW_HEIGHT - INDICATOR_SIZE) / 2, INDICATOR_SIZE, INDICATOR_SIZE ) ); 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); + auto const colour = value_dB <= 0 ? wxColour(0, 255, 0) : wxColour(255, 150, 0); int const range = 18; int height = 0; if (value_dB > -range) { @@ -317,26 +293,17 @@ AudioMappingView::paint_indicators (wxDC& dc) dc.SetBrush (*wxTheBrushList->FindOrCreateBrush(colour, wxBRUSHSTYLE_SOLID)); dc.DrawRectangle ( wxRect( - LEFT_WIDTH + x * GRID_SPACING + (GRID_SPACING - INDICATOR_SIZE) / 2, - TOP_HEIGHT + y * GRID_SPACING + (GRID_SPACING - INDICATOR_SIZE) / 2 + INDICATOR_SIZE - height, + xp + (_column_widths[x] - INDICATOR_SIZE) / 2, + TOP_HEIGHT + y * ROW_HEIGHT + (ROW_HEIGHT - INDICATOR_SIZE) / 2 + INDICATOR_SIZE - height, INDICATOR_SIZE, height ) ); + } + xp += _column_widths[x]; } } -static -void clip (wxDC& dc, int x, int y, int w, int h) -{ - dc.SetClippingRegion (x, y, w, h); -} - -static -void translate (wxDC& dc, int x, int y) -{ - dc.SetLogicalOrigin (x, y); -} static void restore (wxDC& dc) @@ -345,114 +312,112 @@ void restore (wxDC& dc) dc.DestroyClippingRegion (); } + void AudioMappingView::paint () { - wxPaintDC dc (_body); - - int const hs = _horizontal_scroll->GetThumbPosition (); - int const vs = _vertical_scroll->GetThumbPosition (); + wxPaintDC dc(this); paint_static (dc); - clip ( - dc, - LEFT_WIDTH, + dc.SetClippingRegion ( + left_width(), 0, - GRID_SPACING * _output_channels.size(), - GRID_SPACING * (2 + _input_channels.size()) - ); - translate (dc, hs, 0); + _column_widths_total, + ROW_HEIGHT * (2 + _input_channels.size()) + ); paint_column_labels (dc); restore (dc); - clip ( - dc, + dc.SetClippingRegion( 0, TOP_HEIGHT, - GRID_SPACING * 3, - min(int(GRID_SPACING * _input_channels.size()), GetSize().GetHeight() - TOP_HEIGHT) + left_width(), + min(int(ROW_HEIGHT * _input_channels.size()), GetSize().GetHeight() - TOP_HEIGHT) + 1 ); - translate (dc, 0, vs); paint_row_labels (dc); restore (dc); - clip ( - dc, - GRID_SPACING * 2, + dc.SetClippingRegion( + MINIMUM_COLUMN_WIDTH * 2, TOP_HEIGHT, - GRID_SPACING * (1 + _output_channels.size()), - min(int(GRID_SPACING * (2 + _input_channels.size())), GetSize().GetHeight() - TOP_HEIGHT) + MINIMUM_COLUMN_WIDTH + _column_widths_total, + min(int(ROW_HEIGHT * (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) + dc.SetClippingRegion( + left_width(), + MINIMUM_COLUMN_WIDTH, + MINIMUM_COLUMN_WIDTH + _column_widths_total, + min(int(ROW_HEIGHT * (1 + _input_channels.size())), GetSize().GetHeight() - ROW_HEIGHT) ); - translate (dc, hs, vs); paint_column_lines (dc); restore (dc); - clip ( - dc, - LEFT_WIDTH, + dc.SetClippingRegion ( + left_width(), TOP_HEIGHT, - GRID_SPACING * _output_channels.size(), - min(int(GRID_SPACING * _input_channels.size()), GetSize().GetHeight() - TOP_HEIGHT) + _column_widths_total, + min(int(ROW_HEIGHT * _input_channels.size()), GetSize().GetHeight() - TOP_HEIGHT) ); - translate (dc, hs, vs); paint_indicators (dc); 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(); + int x = ev.GetX(); + int const y = ev.GetY(); - if (x <= LEFT_WIDTH || y < TOP_HEIGHT) { - return optional >(); + if (x <= left_width() || y < TOP_HEIGHT) { + return {}; } - int const input = (y - TOP_HEIGHT) / GRID_SPACING; - int const output = (x - LEFT_WIDTH) / GRID_SPACING; + int const input = (y - TOP_HEIGHT) / ROW_HEIGHT; + + x -= left_width(); + int output = 0; + for (auto const i: _column_widths) { + x -= i; + if (x < 0) { + break; + } + ++output; + } if (input >= int(_input_channels.size()) || output >= int(_output_channels.size())) { - return optional >(); + return {}; } - return make_pair (_input_channels[input], _output_channels[output]); + return make_pair(_input_channels[input], _output_channels[output]); } optional AudioMappingView::mouse_event_to_input_group_name (wxMouseEvent& ev) const { - int const x = ev.GetX() + _horizontal_scroll->GetThumbPosition(); - if (x < GRID_SPACING || x > (2 * GRID_SPACING)) { - return optional(); + int const x = ev.GetX(); + if (x < MINIMUM_COLUMN_WIDTH || x > (2 * MINIMUM_COLUMN_WIDTH)) { + return {}; } - int y = (ev.GetY() + _vertical_scroll->GetThumbPosition() - (GRID_SPACING * 2)) / GRID_SPACING; - BOOST_FOREACH (Group i, _input_groups) { + int const y = (ev.GetY() - TOP_HEIGHT) / ROW_HEIGHT; + for (auto i: _input_groups) { if (i.from <= y && y <= i.to) { return i.name; } } - return optional(); + return {}; } void AudioMappingView::left_down (wxMouseEvent& ev) { - optional > channels = mouse_event_to_channels (ev); + auto channels = mouse_event_to_channels (ev); if (!channels) { return; } @@ -469,7 +434,7 @@ AudioMappingView::left_down (wxMouseEvent& ev) void AudioMappingView::right_down (wxMouseEvent& ev) { - optional > channels = mouse_event_to_channels (ev); + auto channels = mouse_event_to_channels (ev); if (!channels) { return; } @@ -479,28 +444,13 @@ AudioMappingView::right_down (wxMouseEvent& ev) PopupMenu (_menu, ev.GetPosition()); } -void -AudioMappingView::mouse_wheel (wxMouseEvent& ev) -{ - if (ev.ShiftDown()) { - _horizontal_scroll->SetThumbPosition ( - _horizontal_scroll->GetThumbPosition() + (ev.GetWheelRotation() > 0 ? -GRID_SPACING : GRID_SPACING) - ); - - } else { - _vertical_scroll->SetThumbPosition ( - _vertical_scroll->GetThumbPosition() + (ev.GetWheelRotation() > 0 ? -GRID_SPACING : GRID_SPACING) - ); - } - Refresh (); -} /** Called when any gain value has changed */ void AudioMappingView::map_values_changed () { Changed (_map); - _last_tooltip_channels = optional >(); + _last_tooltip_channels = boost::none; Refresh (); } @@ -514,13 +464,11 @@ AudioMappingView::set_gain_from_menu (double linear) void AudioMappingView::edit () { - AudioGainDialog* dialog = new AudioGainDialog (this, _menu_input, _menu_output, _map.get(_menu_input, _menu_output)); + auto dialog = make_wx(this, _menu_input, _menu_output, _map.get(_menu_input, _menu_output)); if (dialog->ShowModal() == wxID_OK) { _map.set (_menu_input, _menu_output, dialog->value ()); map_values_changed (); } - - dialog->Destroy (); } void @@ -551,7 +499,7 @@ wxString AudioMappingView::input_channel_name_with_group (NamedChannel const& n) const { optional group; - BOOST_FOREACH (Group i, _input_groups) { + for (auto i: _input_groups) { if (i.from <= n.index && n.index <= i.to) { group = std_to_wx (i.name); } @@ -568,11 +516,11 @@ AudioMappingView::input_channel_name_with_group (NamedChannel const& n) const void AudioMappingView::motion (wxMouseEvent& ev) { - optional > channels = mouse_event_to_channels (ev); + auto channels = mouse_event_to_channels (ev); if (channels) { if (channels != _last_tooltip_channels) { wxString s; - float const gain = _map.get(channels->first.index, channels->second.index); + auto 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'."), @@ -590,7 +538,7 @@ AudioMappingView::motion (wxMouseEvent& ev) std_to_wx(channels->second.name) ); } else { - float const dB = linear_to_db(gain); + auto 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, @@ -604,7 +552,7 @@ AudioMappingView::motion (wxMouseEvent& ev) SetToolTip (s + " " + _("Right click to change gain.")); } } else { - optional group = mouse_event_to_input_group_name (ev); + auto group = mouse_event_to_input_group_name (ev); if (group) { SetToolTip (std_to_wx(*group)); } else { @@ -621,3 +569,12 @@ AudioMappingView::set_input_groups (vector const & groups) { _input_groups = groups; } + + +int +AudioMappingView::left_width() const +{ + return _input_groups.empty() ? (MINIMUM_COLUMN_WIDTH * 2) : (MINIMUM_COLUMN_WIDTH * 3); +} + +