X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Faudio_mapping_view.cc;h=e1c96fdebe962d35784f5940c63aa03a52ed9a33;hp=1771c12304501185858a4cf02e63abd48ec81442;hb=c622a06189181a3a6ad356094c9a3cf4e1f5a722;hpb=32a7078958eadec48a4da02e5d5d5e0afb94c6eb

diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index 1771c1230..e1c96fdeb 100644
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -22,17 +22,20 @@
  *  @brief AudioMappingView class and helpers.
  */
 
-#include "lib/audio_mapping.h"
-#include "lib/util.h"
-#include "lib/raw_convert.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 <dcp/locale_convert.h>
 #include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 #include <wx/renderer.h>
 #include <wx/grid.h>
 #include <wx/graphics.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/foreach.hpp>
 #include <iostream>
 
@@ -42,416 +45,583 @@ using std::string;
 using std::min;
 using std::max;
 using std::vector;
+using std::pair;
+using std::make_pair;
 using boost::shared_ptr;
+using boost::optional;
+using dcp::locale_convert;
 
-#define INDICATOR_SIZE 16
-#define LEFT_WIDTH 48
+#define INDICATOR_SIZE 20
+#define GRID_SPACING 32
+#define LEFT_WIDTH (GRID_SPACING * 3)
+#define TOP_HEIGHT (GRID_SPACING * 2)
 
 enum {
 	ID_off = 1,
-	ID_full = 2,
-	ID_minus6dB = 3,
-	ID_edit = 4
-};
-
-class NoSelectionStringRenderer : public wxGridCellStringRenderer
-{
-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);
-	}
-};
-
-/** @class ValueRenderer
- *  @brief wxGridCellRenderer for a gain value.
- */
-class ValueRenderer : public wxGridCellRenderer
-{
-public:
-
-	void Draw (wxGrid& grid, wxGridCellAttr &, wxDC& dc, const wxRect& rect, int row, int col, bool)
-	{
-		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 = raw_convert<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);
-		}
-
-		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);
-		}
-
-		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 (INDICATOR_SIZE + 4, INDICATOR_SIZE + 4);
-	}
-
-	wxGridCellRenderer* Clone () const
-	{
-		return new ValueRenderer;
-	}
+	ID_minus6dB = 2,
+	ID_0dB = 3,
+	ID_plus3dB = 4,
+	ID_edit = 5
 };
 
-
-AudioMappingView::AudioMappingView (wxWindow* parent)
+AudioMappingView::AudioMappingView (wxWindow* parent, wxString left_label, wxString from, wxString top_label, wxString to)
 	: wxPanel (parent, wxID_ANY)
-	, _menu_row (0)
-	, _menu_column (1)
-	, _last_tooltip_row (0)
-	, _last_tooltip_column (0)
+	, _menu_input (0)
+	, _menu_output (1)
+	, _left_label (left_label)
+	, _from (from)
+	, _top_label (top_label)
+	, _to (to)
 {
-	_left_labels = new wxPanel (this, wxID_ANY);
-	_left_labels->Bind (wxEVT_PAINT, boost::bind (&AudioMappingView::paint_left_labels, this));
-	_top_labels = new wxPanel (this, wxID_ANY);
-	_top_labels->Bind (wxEVT_PAINT, boost::bind (&AudioMappingView::paint_top_labels, this));
-
-	_grid = new wxGrid (this, wxID_ANY);
-
-	_grid->CreateGrid (0, MAX_DCP_AUDIO_CHANNELS + 1);
-	_grid->HideRowLabels ();
-	_grid->DisableDragRowSize ();
-	_grid->DisableDragColSize ();
-	_grid->EnableEditing (false);
-	_grid->SetCellHighlightPenWidth (0);
-	_grid->SetDefaultRenderer (new NoSelectionStringRenderer);
-	_grid->AutoSize ();
-
-	wxSizer* vertical_sizer = new wxBoxSizer (wxVERTICAL);
-	vertical_sizer->Add (_top_labels);
-	wxSizer* horizontal_sizer = new wxBoxSizer (wxHORIZONTAL);
-	horizontal_sizer->Add (_left_labels);
-	horizontal_sizer->Add (_grid, 1, wxEXPAND | wxALL);
-	vertical_sizer->Add (horizontal_sizer);
-	SetSizerAndFit (vertical_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));
-	Bind (wxEVT_SIZE, boost::bind (&AudioMappingView::sized, this, _1));
-
 	_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..."));
 
-	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::minus6dB, this), ID_minus6dB);
-	Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&AudioMappingView::edit, this), ID_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));
 }
 
-/** Called when any gain value has changed */
 void
-AudioMappingView::map_values_changed ()
+AudioMappingView::size (wxSizeEvent& ev)
 {
-	update_cells ();
-	Changed (_map);
-	_last_tooltip_column = -1;
+	setup ();
+	ev.Skip ();
 }
 
 void
-AudioMappingView::left_click (wxGridEvent& ev)
+AudioMappingView::setup ()
 {
-	if (ev.GetCol() == 0) {
-		return;
-	}
+	wxSize const s = GetSize();
+	int const w = _vertical_scroll->GetSize().GetWidth();
+	int const h = _horizontal_scroll->GetSize().GetHeight();
 
-	int const d = ev.GetCol() - 1;
+	_vertical_scroll->SetPosition (wxPoint(s.GetWidth() - w, 0));
+	_vertical_scroll->SetSize (wxSize(w, max(0, s.GetHeight() - h)));
 
-	if (_map.get (ev.GetRow(), d) > 0) {
-		_map.set (ev.GetRow(), d, 0);
-	} else {
-		_map.set (ev.GetRow(), d, 1);
-	}
+	_body->SetSize (wxSize(max(0, s.GetWidth() - w), max(0, s.GetHeight() - h)));
 
-	map_values_changed ();
-}
+	_horizontal_scroll->SetPosition (wxPoint(0, s.GetHeight() - h));
+	_horizontal_scroll->SetSize (wxSize(max(0, s.GetWidth() - w), h));
 
-void
-AudioMappingView::right_click (wxGridEvent& ev)
-{
-	if (ev.GetCol() == 0) {
-		return;
-	}
+	_vertical_scroll->SetScrollbar (
+		_vertical_scroll->GetThumbPosition(),
+		s.GetHeight() - h - 8,
+		GRID_SPACING * (2 + _input_channels.size()),
+		GRID_SPACING,
+		true
+		);
 
-	_menu_row = ev.GetRow ();
-	_menu_column = ev.GetCol ();
-	PopupMenu (_menu, ev.GetPosition ());
+	_horizontal_scroll->SetScrollbar (
+		_horizontal_scroll->GetThumbPosition(),
+		s.GetWidth() - w - 8,
+		GRID_SPACING * (3 + _output_channels.size()),
+		GRID_SPACING,
+		true);
 }
 
 void
-AudioMappingView::off ()
+AudioMappingView::scroll ()
 {
-	_map.set (_menu_row, _menu_column - 1, 0);
-	map_values_changed ();
+	Refresh ();
 }
 
 void
-AudioMappingView::full ()
+AudioMappingView::paint_static (wxDC& dc)
 {
-	_map.set (_menu_row, _menu_column - 1, 1);
-	map_values_changed ();
+	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 + (_output_channels.size() * GRID_SPACING - label_width) / 2, (GRID_SPACING - 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,
+		90
+		);
+
+	dc.SetFont (*wxSWISS_FONT);
 }
 
 void
-AudioMappingView::minus6dB ()
+AudioMappingView::paint_column_labels (wxDC& dc)
 {
-	_map.set (_menu_row, _menu_column - 1, pow (10, -6.0 / 20));
-	map_values_changed ();
+	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);
+		++N;
+	}
+
+	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::edit ()
+AudioMappingView::paint_column_lines (wxDC& dc)
 {
-	int const d = _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_values_changed ();
+	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)
+			);
 	}
 
-	dialog->Destroy ();
+	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::set (AudioMapping map)
+AudioMappingView::paint_row_labels (wxDC& dc)
 {
-	_map = map;
-	update_cells ();
-}
+	wxCoord label_width;
+	wxCoord label_height;
+
+	/* 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);
+		++N;
+	}
+
+	/* 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)
+			);
+	}
+
+	/* Group labels and lines */
+
+	int y = TOP_HEIGHT;
+	BOOST_FOREACH (Group i, _input_groups) {
+		int const height = (i.to - i.from + 1) * GRID_SPACING;
+		dc.GetTextExtent (std_to_wx(i.name), &label_width, &label_height);
+		if (label_width > height) {
+			label_width = height - 8;
+		}
+
+		{
+			int yp = y;
+			if ((yp - 2 * GRID_SPACING) < dc.GetLogicalOrigin().y) {
+				yp += dc.GetLogicalOrigin().y;
+			}
+
+			dc.DrawRotatedText (
+				std_to_wx(i.name),
+				GRID_SPACING + (GRID_SPACING - 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::set_input_channels (vector<string> const & names)
+AudioMappingView::paint_row_lines (wxDC& dc)
 {
-	for (int i = 0; i < _grid->GetNumberRows(); ++i) {
-		_grid->SetCellValue (i, 0, std_to_wx (names[i]));
+	for (size_t i = 0; i < _input_channels.size(); ++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)
+			);
 	}
+	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::set_output_channels (vector<string> const & names)
+AudioMappingView::paint_indicators (wxDC& dc)
 {
-	int const o = names.size() + 1;
-	if (o < _grid->GetNumberCols ()) {
-		_grid->DeleteCols (o, _grid->GetNumberCols() - o);
-	} else if (o > _grid->GetNumberCols ()) {
-		_grid->InsertCols (_grid->GetNumberCols(), o - _grid->GetNumberCols());
+	/* _{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()));
+
+	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,
+					INDICATOR_SIZE, INDICATOR_SIZE
+					)
+				);
+
+			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 = min(INDICATOR_SIZE, static_cast<int>(INDICATOR_SIZE * (1 + value_dB / range)));
+			}
+
+			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,
+					INDICATOR_SIZE, height
+					)
+				);
+		}
 	}
+}
 
-	_grid->SetColLabelValue (0, wxT (""));
+static
+void clip (wxDC& dc, int x, int y, int w, int h)
+{
+	dc.SetClippingRegion (x, y, w, h);
+}
 
-	for (size_t i = 0; i < names.size(); ++i) {
-		_grid->SetColLabelValue (i + 1, std_to_wx (names[i]));
-	}
+static
+void translate (wxDC& dc, int x, int y)
+{
+	dc.SetLogicalOrigin (x, y);
+}
 
-	update_cells ();
+static
+void restore (wxDC& dc)
+{
+	dc.SetLogicalOrigin (0, 0);
+	dc.DestroyClippingRegion ();
 }
 
 void
-AudioMappingView::update_cells ()
+AudioMappingView::paint ()
+{
+	wxPaintDC dc (_body);
+
+	int const hs = _horizontal_scroll->GetThumbPosition ();
+	int const vs = _vertical_scroll->GetThumbPosition ();
+
+	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);
+}
+
+optional<pair<int, int> >
+AudioMappingView::mouse_event_to_channels (wxMouseEvent& ev) const
 {
-	vector<string> row_names;
-	for (int i = 0; i < _grid->GetNumberRows (); ++i) {
-		row_names.push_back (wx_to_std (_grid->GetCellValue (i, 0)));
+	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<pair<int, int> >();
 	}
 
-	if (_grid->GetNumberRows ()) {
-		_grid->DeleteRows (0, _grid->GetNumberRows ());
+	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<pair<int, int> >();
 	}
 
-	_grid->InsertRows (0, _map.input_channels ());
+	return make_pair (input, output);
+}
 
-	for (int i = 0; i < _map.input_channels(); ++i) {
-		for (int j = 0; j < _map.output_channels(); ++j) {
-			_grid->SetCellRenderer (i, j + 1, new ValueRenderer);
-		}
+optional<string>
+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<string>();
 	}
 
-	for (int i = 0; i < _map.input_channels(); ++i) {
-		if (i < int (row_names.size ())) {
-			_grid->SetCellValue (i, 0, std_to_wx (row_names[i]));
-		}
-		for (int j = 1; j < _grid->GetNumberCols(); ++j) {
-			_grid->SetCellValue (i, j, std_to_wx (raw_convert<string> (_map.get (i, j - 1))));
+	int y = (ev.GetY() + _vertical_scroll->GetThumbPosition() - (GRID_SPACING * 2)) / GRID_SPACING;
+	BOOST_FOREACH (Group i, _input_groups) {
+		if (i.from <= y && y <= i.to) {
+			return i.name;
 		}
 	}
 
-	_grid->AutoSize ();
+	return optional<string>();
 }
 
 void
-AudioMappingView::mouse_moved (wxMouseEvent& ev)
+AudioMappingView::left_down (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;
+	optional<pair<int, int> > channels = mouse_event_to_channels (ev);
+	if (!channels) {
+		return;
 	}
 
-	if (row != _last_tooltip_row || column != _last_tooltip_column) {
-
-		wxString s;
-		float const gain = _map.get (row, 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;
+	if (_map.get(channels->first, channels->second) > 0) {
+		_map.set (channels->first, channels->second, 0);
+	} else {
+		_map.set (channels->first, channels->second, 1);
 	}
 
-        ev.Skip ();
+	map_values_changed ();
 }
 
 void
-AudioMappingView::sized (wxSizeEvent& ev)
+AudioMappingView::right_down (wxMouseEvent& ev)
 {
-	int const top_height = 24;
+	optional<pair<int, int> > channels = mouse_event_to_channels (ev);
+	if (!channels) {
+		return;
+	}
 
-	_grid->AutoSize ();
-	_left_labels->SetMinSize (wxSize (LEFT_WIDTH, _grid->GetSize().GetHeight()));
-	_top_labels->SetMinSize (wxSize (_grid->GetSize().GetWidth() + LEFT_WIDTH, top_height));
-	_left_labels->Refresh ();
-	_top_labels->Refresh ();
-	ev.Skip ();
+	_menu_input = channels->first;
+	_menu_output = channels->second;
+	PopupMenu (_menu, ev.GetPosition());
 }
 
 void
-AudioMappingView::paint_left_labels ()
+AudioMappingView::mouse_wheel (wxMouseEvent& ev)
 {
-	wxPaintDC dc (_left_labels);
+	if (ev.ShiftDown()) {
+		_horizontal_scroll->SetThumbPosition (
+			_horizontal_scroll->GetThumbPosition() + (ev.GetWheelRotation() > 0 ? -GRID_SPACING : GRID_SPACING)
+			);
 
-	wxGraphicsContext* gc = wxGraphicsContext::Create (dc);
-	if (!gc) {
-		return;
+	} else {
+		_vertical_scroll->SetThumbPosition (
+			_vertical_scroll->GetThumbPosition() + (ev.GetWheelRotation() > 0 ? -GRID_SPACING : GRID_SPACING)
+			);
 	}
+	Refresh ();
+}
 
-	wxSize const size = dc.GetSize();
-	int const half = size.GetWidth() / 2;
-
-	gc->SetPen (wxPen (wxColour (0, 0, 0)));
-	gc->SetAntialiasMode (wxANTIALIAS_DEFAULT);
+/** Called when any gain value has changed */
+void
+AudioMappingView::map_values_changed ()
+{
+	Changed (_map);
+	_last_tooltip_channels = optional<pair<int, int> >();
+	Refresh ();
+}
 
-	if (_grid->GetNumberRows() > 0) {
+void
+AudioMappingView::set_gain_from_menu (double linear)
+{
+	_map.set (_menu_input, _menu_output, linear);
+	map_values_changed ();
+}
 
-		/* Draw a line at the top of the first group */
-		int ypos = _grid->GetColLabelSize() - 1;
-		wxGraphicsPath lines = gc->CreatePath();
-		lines.MoveToPoint (half, ypos);
-		lines.AddLineToPoint (size.GetWidth(), ypos);
+void
+AudioMappingView::edit ()
+{
+	AudioGainDialog* dialog = new 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 ();
+	}
 
-		/* And the names of the groups and a line under each */
-		BOOST_FOREACH (Group const & i, _input_groups) {
-			int const old_ypos = ypos;
-			ypos += (i.to - i.from + 1) * _grid->GetRowSize(0);
+	dialog->Destroy ();
+}
 
-			dc.SetClippingRegion (0, old_ypos + 2, size.GetWidth(), ypos - 4);
+void
+AudioMappingView::set (AudioMapping map)
+{
+	_map = map;
+	Refresh ();
+}
 
-			dc.SetFont (*wxSWISS_FONT);
-			wxCoord label_width;
-			wxCoord label_height;
-			dc.GetTextExtent (std_to_wx (i.name), &label_width, &label_height);
+void
+AudioMappingView::set_input_channels (vector<string> const & names)
+{
+	_input_channels = names;
+	setup ();
+	Refresh ();
+}
 
-			dc.DrawRotatedText (
-				i.name,
-				half + (half - label_height) / 2,
-				min (ypos, (ypos + old_ypos + label_width) / 2),
-				90
-				);
+void
+AudioMappingView::set_output_channels (vector<string> const & names)
+{
+	_output_channels = names;
+	setup ();
+	Refresh ();
+}
 
-			dc.DestroyClippingRegion ();
+wxString
+AudioMappingView::safe_input_channel_name (int n) const
+{
+	if (n >= int(_input_channels.size())) {
+		return wxString::Format ("%d", n + 1);
+	}
 
-			lines.MoveToPoint (half, ypos);
-			lines.AddLineToPoint (size.GetWidth(), ypos);
+	optional<wxString> group;
+	BOOST_FOREACH (Group i, _input_groups) {
+		if (i.from <= n && n <= i.to) {
+			group = std_to_wx (i.name);
 		}
-
-		gc->StrokePath (lines);
 	}
 
-	/* Overall label */
-	dc.SetFont (wxSWISS_FONT->Bold());
-	wxCoord overall_label_width;
-	wxCoord overall_label_height;
-	dc.GetTextExtent (_("Content"), &overall_label_width, &overall_label_height);
-	dc.DrawRotatedText (
-		_("Content"),
-		(half - overall_label_height) / 2,
-		min (size.GetHeight(), (size.GetHeight() + _grid->GetColLabelSize() + overall_label_width) / 2),
-		90
-		);
+	if (group && !group->IsEmpty()) {
+		return wxString::Format ("%s/%s", group->data(), std_to_wx(_input_channels[n]).data());
+	}
 
-	delete gc;
+	return std_to_wx(_input_channels[n]);
 }
 
-void
-AudioMappingView::paint_top_labels ()
+wxString
+AudioMappingView::safe_output_channel_name (int n) const
 {
-	wxPaintDC dc (_top_labels);
-	if (_grid->GetNumberCols() == 0) {
-		return;
-	}
-
-	wxGraphicsContext* gc = wxGraphicsContext::Create (dc);
-	if (!gc) {
-		return;
+	if (n >= int(_output_channels.size())) {
+		return wxString::Format ("%d", n + 1);
 	}
 
-	wxSize const size = dc.GetSize();
-
-	gc->SetAntialiasMode (wxANTIALIAS_DEFAULT);
-
-	dc.SetFont (wxSWISS_FONT->Bold());
-	wxCoord label_width;
-	wxCoord label_height;
-	dc.GetTextExtent (_("DCP"), &label_width, &label_height);
-
-	dc.DrawText (_("DCP"), (size.GetWidth() + _grid->GetColSize(0) + LEFT_WIDTH - label_width) / 2, (size.GetHeight() - label_height) / 2);
+	return std_to_wx(_output_channels[n]);
+}
 
-	gc->SetPen (wxPen (wxColour (0, 0, 0)));
-	wxGraphicsPath lines = gc->CreatePath();
-	lines.MoveToPoint (LEFT_WIDTH + _grid->GetColSize(0) - 1, 0);
-	lines.AddLineToPoint (LEFT_WIDTH + _grid->GetColSize(0) - 1, size.GetHeight());
-	lines.MoveToPoint (size.GetWidth() - 1, 0);
-	lines.AddLineToPoint (size.GetWidth() - 1, size.GetHeight());
-	gc->StrokePath (lines);
+void
+AudioMappingView::motion (wxMouseEvent& ev)
+{
+	optional<pair<int, int> > channels = mouse_event_to_channels (ev);
+	if (channels) {
+		if (channels != _last_tooltip_channels) {
+			wxString s;
+			float const gain = _map.get(channels->first, channels->second);
+			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),
+					_to,
+					safe_output_channel_name(channels->second)
+					);
+			} 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),
+					_to,
+					safe_output_channel_name(channels->second)
+					);
+			} 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),
+					_to,
+					safe_output_channel_name(channels->second),
+					dB
+					);
+			}
+
+			SetToolTip (s + " " + _("Right click to change gain."));
+		}
+	} else {
+		optional<string> group = mouse_event_to_input_group_name (ev);
+		if (group) {
+			SetToolTip (std_to_wx(*group));
+		} else {
+			SetToolTip ("");
+		}
+	}
 
-	delete gc;
+	_last_tooltip_channels = channels;
+        ev.Skip ();
 }
 
 void