X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_mapping_view.cc;h=8e92400bdb956ffd7b58205dccf5626bf9015be7;hb=e87f943433216d294b22853411eca5c582be1066;hp=c08da091241b2c92e75dbd0c159d3688fccda9fb;hpb=f9608c5299d0a58bc01b33e521d89a80be26ed23;p=dcpomatic.git

diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index c08da0912..6f4a39b1e 100644
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -1,337 +1,580 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include <wx/wx.h>
-#include <wx/renderer.h>
-#include <wx/grid.h>
-#include <libdcp/types.h>
-#include "lib/audio_mapping.h"
-#include "lib/util.h"
+
+/** @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/maths_util.h"
+#include <dcp/locale_convert.h>
+#include <dcp/types.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
+#include <wx/graphics.h>
+#include <wx/grid.h>
+#include <wx/renderer.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
+
 
-using std::cout;
 using std::list;
-using std::string;
+using std::make_pair;
 using std::max;
-using boost::shared_ptr;
-using boost::lexical_cast;
+using std::min;
+using std::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;
+
+
+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;
 
-#define INDICATOR_SIZE 20
 
 enum {
 	ID_off = 1,
-	ID_full = 2,
-	ID_minus3dB = 3,
-	ID_edit = 4
+	ID_minus6dB = 2,
+	ID_0dB = 3,
+	ID_plus3dB = 4,
+	ID_edit = 5
 };
 
-class NoSelectionStringRenderer : public wxGridCellStringRenderer
+
+AudioMappingView::AudioMappingView (wxWindow* parent, wxString left_label, wxString from, wxString top_label, wxString to)
+	: wxPanel (parent, wxID_ANY)
+	, _menu_input (0)
+	, _menu_output (1)
+	, _left_label (left_label)
+	, _from (from)
+	, _top_label (top_label)
+	, _to (to)
 {
-public:
-	void Draw (wxGrid& grid, wxGridCellAttr& attr, wxDC& dc, const wxRect& rect, int row, int col, bool)
-	{
-		wxGridCellStringRenderer::Draw (grid, attr, dc, rect, row, col, false);
+	_menu = new wxMenu;
+	_menu->Append (ID_off, _("Off"));
+	_menu->Append (ID_minus6dB, _("-6dB"));
+	_menu->Append (ID_0dB, _("0dB (unchanged)"));
+	_menu->Append (ID_plus3dB, _("+3dB"));
+	_menu->Append (ID_edit, _("Edit..."));
+
+#ifndef __WXOSX__
+	SetDoubleBuffered (true);
+#endif
+
+	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_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::setup ()
+{
+	wxClientDC dc (GetParent());
+	dc.SetFont (wxSWISS_FONT->Bold());
+
+	_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;
 	}
-};
 
-class ValueRenderer : public wxGridCellRenderer
+	SetMinSize({8 + left_width() + _column_widths_total, static_cast<int>(8 + TOP_HEIGHT + ROW_HEIGHT * _input_channels.size())});
+}
+
+
+void
+AudioMappingView::paint_static (wxDC& dc)
+{
+	dc.SetFont (wxSWISS_FONT->Bold());
+	wxCoord label_width;
+	wxCoord label_height;
+
+	dc.GetTextExtent (_top_label, &label_width, &label_height);
+	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,
+		(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 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(), 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)
 {
-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);
-
-		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<float> (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);
+	int x = left_width();
+	for (size_t i = 0; i < _output_channels.size(); ++i) {
+		dc.DrawLine (
+			wxPoint(x, ROW_HEIGHT),
+			wxPoint(x, TOP_HEIGHT + _input_channels.size() * ROW_HEIGHT)
+			);
+		x += _column_widths[i];
+	}
+
+	dc.DrawLine (
+		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)
+{
+	wxCoord label_width;
+	wxCoord label_height;
+
+	/* Row channel labels */
+
+	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(MINIMUM_COLUMN_WIDTH * i, TOP_HEIGHT),
+			wxPoint(MINIMUM_COLUMN_WIDTH * i, TOP_HEIGHT + _input_channels.size() * ROW_HEIGHT)
+			);
+	}
+
+	int y = TOP_HEIGHT;
+	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;
 		}
 
-		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);
+		{
+			wxDCClipper clip (dc, wxRect(MINIMUM_COLUMN_WIDTH, y, ROW_HEIGHT, height));
+			int yp = y;
+			if ((yp - 2 * ROW_HEIGHT) < dc.GetLogicalOrigin().y) {
+				yp += dc.GetLogicalOrigin().y;
+			}
+
+			dc.DrawRotatedText (
+				std_to_wx(i.name),
+				ROW_HEIGHT + (ROW_HEIGHT - label_height) / 2,
+				y + (height + label_width) / 2,
+				90
+				);
 		}
 
-		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));
+		y += height;
 	}
+}
 
-	wxSize GetBestSize (wxGrid &, wxGridCellAttr &, wxDC &, int, int)
-	{
-		return wxSize (INDICATOR_SIZE + 4, INDICATOR_SIZE + 4);
+
+void
+AudioMappingView::paint_row_lines (wxDC& dc)
+{
+	for (size_t i = 0; i < _input_channels.size() + 1; ++i) {
+		dc.DrawLine (
+			wxPoint(MINIMUM_COLUMN_WIDTH * 2, TOP_HEIGHT + ROW_HEIGHT * i),
+			wxPoint(left_width() + _column_widths_total, TOP_HEIGHT + ROW_HEIGHT * i)
+			);
 	}
-	
-	wxGridCellRenderer* Clone () const
-	{
-		return new ValueRenderer;
+}
+
+
+void
+AudioMappingView::paint_indicators (wxDC& dc)
+{
+	/* _{input,output}_channels and _map may not always be in sync, be careful here */
+	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(
+					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));
+			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) {
+				height = min(INDICATOR_SIZE, static_cast<int>(INDICATOR_SIZE * (1 + value_dB / range)));
+			}
+
+			dc.SetBrush (*wxTheBrushList->FindOrCreateBrush(colour, wxBRUSHSTYLE_SOLID));
+			dc.DrawRectangle (
+				wxRect(
+					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];
 	}
-};
+}
 
 
-AudioMappingView::AudioMappingView (wxWindow* parent)
-	: wxPanel (parent, wxID_ANY)
-	, _menu_row (0)
-	, _menu_column (1)
-	, _last_tooltip_row (0)
-	, _last_tooltip_column (0)
+static
+void restore (wxDC& dc)
 {
-	_grid = new wxGrid (this, wxID_ANY);
+	dc.SetLogicalOrigin (0, 0);
+	dc.DestroyClippingRegion ();
+}
 
-	_grid->CreateGrid (0, MAX_AUDIO_CHANNELS + 1);
-	_grid->HideRowLabels ();
-	_grid->DisableDragRowSize ();
-	_grid->DisableDragColSize ();
-	_grid->EnableEditing (false);
-	_grid->SetCellHighlightPenWidth (0);
-	_grid->SetDefaultRenderer (new NoSelectionStringRenderer);
 
-	set_column_labels ();
+void
+AudioMappingView::paint ()
+{
+	wxPaintDC dc(this);
+
+	paint_static (dc);
+
+	dc.SetClippingRegion (
+		left_width(),
+		0,
+		_column_widths_total,
+		ROW_HEIGHT * (2 + _input_channels.size())
+		);
+	paint_column_labels (dc);
+	restore (dc);
+
+	dc.SetClippingRegion(
+		0,
+		TOP_HEIGHT,
+		left_width(),
+		min(int(ROW_HEIGHT * _input_channels.size()), GetSize().GetHeight() - TOP_HEIGHT) + 1
+	     );
+	paint_row_labels (dc);
+	restore (dc);
+
+	dc.SetClippingRegion(
+		MINIMUM_COLUMN_WIDTH * 2,
+		TOP_HEIGHT,
+		MINIMUM_COLUMN_WIDTH + _column_widths_total,
+		min(int(ROW_HEIGHT * (2 + _input_channels.size())), GetSize().GetHeight() - TOP_HEIGHT)
+	     );
+	paint_row_lines (dc);
+	restore (dc);
+
+	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)
+	     );
+	paint_column_lines (dc);
+	restore (dc);
+
+	dc.SetClippingRegion (
+		left_width(),
+		TOP_HEIGHT,
+		_column_widths_total,
+		min(int(ROW_HEIGHT * _input_channels.size()), GetSize().GetHeight() - TOP_HEIGHT)
+	     );
+	paint_indicators (dc);
+	restore (dc);
+}
 
-	_sizer = new wxBoxSizer (wxVERTICAL);
-	_sizer->Add (_grid, 1, wxEXPAND | wxALL);
-	SetSizerAndFit (_sizer);
 
-	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));
+optional<pair<NamedChannel, NamedChannel>>
+AudioMappingView::mouse_event_to_channels (wxMouseEvent& ev) const
+{
+	int x = ev.GetX();
+	int const y = ev.GetY();
 
-	_menu = new wxMenu;
-	_menu->Append (ID_off, _("Off"));
-	_menu->Append (ID_full, _("Full"));
-	_menu->Append (ID_minus3dB, _("-3dB"));
-	_menu->Append (ID_edit, _("Edit..."));
+	if (x <= left_width() || y < TOP_HEIGHT) {
+		return {};
+	}
 
-	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);
+	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 {};
+	}
+
+	return make_pair(_input_channels[input], _output_channels[output]);
 }
 
-void
-AudioMappingView::map_changed ()
+optional<string>
+AudioMappingView::mouse_event_to_input_group_name (wxMouseEvent& ev) const
 {
-	update_cells ();
-	Changed (_map);
-	_last_tooltip_column = -1;
-}	
+	int const x = ev.GetX();
+	if (x < MINIMUM_COLUMN_WIDTH || x > (2 * MINIMUM_COLUMN_WIDTH)) {
+		return {};
+	}
+
+	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 {};
+}
 
 void
-AudioMappingView::left_click (wxGridEvent& ev)
+AudioMappingView::left_down (wxMouseEvent& ev)
 {
-	if (ev.GetCol() == 0) {
+	auto channels = mouse_event_to_channels (ev);
+	if (!channels) {
 		return;
 	}
 
-	libdcp::Channel d = static_cast<libdcp::Channel> (ev.GetCol() - 1);
-	
-	if (_map.get (ev.GetRow(), d) > 0) {
-		_map.set (ev.GetRow(), d, 0);
+	if (_map.get(channels->first.index, channels->second.index) > 0) {
+		_map.set (channels->first.index, channels->second.index, 0);
 	} else {
-		_map.set (ev.GetRow(), d, 1);
+		_map.set (channels->first.index, channels->second.index, 1);
 	}
 
-	map_changed ();
+	map_values_changed ();
 }
 
 void
-AudioMappingView::right_click (wxGridEvent& ev)
+AudioMappingView::right_down (wxMouseEvent& ev)
 {
-	if (ev.GetCol() == 0) {
+	auto channels = mouse_event_to_channels (ev);
+	if (!channels) {
 		return;
 	}
 
-	_menu_row = ev.GetRow ();
-	_menu_column = ev.GetCol ();
-	PopupMenu (_menu, ev.GetPosition ());
+	_menu_input = channels->first.index;
+	_menu_output = channels->second.index;
+	PopupMenu (_menu, ev.GetPosition());
 }
 
-void
-AudioMappingView::off ()
-{
-	_map.set (_menu_row, static_cast<libdcp::Channel> (_menu_column - 1), 0);
-	map_changed ();
-}
 
+/** Called when any gain value has changed */
 void
-AudioMappingView::full ()
+AudioMappingView::map_values_changed ()
 {
-	_map.set (_menu_row, static_cast<libdcp::Channel> (_menu_column - 1), 1);
-	map_changed ();
+	Changed (_map);
+	_last_tooltip_channels = boost::none;
+	Refresh ();
 }
 
 void
-AudioMappingView::minus3dB ()
+AudioMappingView::set_gain_from_menu (double linear)
 {
-	_map.set (_menu_row, static_cast<libdcp::Channel> (_menu_column - 1), 1 / sqrt (2));
-	map_changed ();
+	_map.set (_menu_input, _menu_output, linear);
+	map_values_changed ();
 }
 
 void
 AudioMappingView::edit ()
 {
-	libdcp::Channel d = static_cast<libdcp::Channel> (_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 ();
+	auto dialog = make_wx<AudioGainDialog>(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
 AudioMappingView::set (AudioMapping map)
 {
 	_map = map;
-	update_cells ();
+	Refresh ();
 }
 
 void
-AudioMappingView::update_cells ()
+AudioMappingView::set_input_channels (vector<NamedChannel> const& channels)
 {
-	LocaleGuard lg;
-	
-	if (_grid->GetNumberRows ()) {
-		_grid->DeleteRows (0, _grid->GetNumberRows ());
-	}
+	_input_channels = channels;
+	setup ();
+	Refresh ();
+}
 
-	_grid->InsertRows (0, _map.content_channels ());
+void
+AudioMappingView::set_output_channels (vector<NamedChannel> const & channels)
+{
+	_output_channels = channels;
+	setup ();
+	Refresh ();
+}
 
-	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 < _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<string> (_map.get (i, static_cast<libdcp::Channel> (j - 1)))));
+wxString
+AudioMappingView::input_channel_name_with_group (NamedChannel const& n) const
+{
+	optional<wxString> group;
+	for (auto i: _input_groups) {
+		if (i.from <= n.index && n.index <= i.to) {
+			group = std_to_wx (i.name);
 		}
 	}
 
-	_grid->AutoSize ();
-}
-
-/** @param c Number of DCP channels */
-void
-AudioMappingView::set_channels (int c)
-{
-	c++;
-
-	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 ();
+	if (group && !group->IsEmpty()) {
+		return wxString::Format ("%s/%s", group->data(), std_to_wx(n.name).data());
 	}
 
-	update_cells ();
+	return std_to_wx(n.name);
 }
 
+
 void
-AudioMappingView::set_column_labels ()
+AudioMappingView::motion (wxMouseEvent& ev)
 {
-	int const c = _grid->GetNumberCols ();
-	
-	_grid->SetColLabelValue (0, _("Content channel"));
-	
-	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"));
+	auto channels = mouse_event_to_channels (ev);
+	if (channels) {
+		if (channels != _last_tooltip_channels) {
+			wxString s;
+			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'."),
+					_from,
+					input_channel_name_with_group(channels->first),
+					_to,
+					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,
+					input_channel_name_with_group(channels->first),
+					_to,
+					std_to_wx(channels->second.name)
+					);
+			} else {
+				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,
+					input_channel_name_with_group(channels->first),
+					_to,
+					std_to_wx(channels->second.name),
+					dB
+					);
+			}
+
+			SetToolTip (s + " " + _("Right click to change gain."));
+		}
+	} else {
+		auto group = mouse_event_to_input_group_name (ev);
+		if (group) {
+			SetToolTip (std_to_wx(*group));
+		} else {
+			SetToolTip ("");
+		}
 	}
 
-	_grid->AutoSize ();
+	_last_tooltip_channels = channels;
+        ev.Skip ();
 }
 
 void
-AudioMappingView::mouse_moved (wxMouseEvent& ev)
+AudioMappingView::set_input_groups (vector<Group> const & groups)
 {
-	int xx;
-	int yy;
-	_grid->CalcUnscrolledPosition (ev.GetX(), ev.GetY(), &xx, &yy);
+	_input_groups = groups;
+}
 
-	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) {
+int
+AudioMappingView::left_width() const
+{
+	return _input_groups.empty() ? (MINIMUM_COLUMN_WIDTH * 2) : (MINIMUM_COLUMN_WIDTH * 3);
+}
 
-		wxString s;
-		float const gain = _map.get (row, static_cast<libdcp::Channel> (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 ();
-}