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

diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index 8e92400bd..df2759ef6 100644
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2020 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/>.
 
 */
 
@@ -21,26 +22,36 @@
  *  @brief AudioMappingView class and helpers.
  */
 
-#include <wx/wx.h>
-#include <wx/renderer.h>
-#include <wx/grid.h>
-#include <dcp/types.h>
-#include <dcp/raw_convert.h>
-#include "lib/audio_mapping.h"
-#include "lib/util.h"
 #include "audio_mapping_view.h"
 #include "wx_util.h"
 #include "audio_gain_dialog.h"
-#include <boost/lexical_cast.hpp>
+#include "lib/audio_mapping.h"
+#include "lib/util.h"
+#include <dcp/locale_convert.h>
+#include <dcp/types.h>
+#include <wx/wx.h>
+#include <wx/renderer.h>
+#include <wx/grid.h>
+#include <wx/graphics.h>
+#include <boost/foreach.hpp>
+#include <iostream>
 
 using std::cout;
 using std::list;
 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::lexical_cast;
+using boost::optional;
+using dcp::locale_convert;
 
-#define INDICATOR_SIZE 16
+#define INDICATOR_SIZE 20
+#define GRID_SPACING 32
+#define LEFT_WIDTH (GRID_SPACING * 3)
+#define TOP_HEIGHT (GRID_SPACING * 2)
 
 enum {
 	ID_off = 1,
@@ -49,175 +60,449 @@ enum {
 	ID_edit = 4
 };
 
-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)
+{
+	_menu = new wxMenu;
+	_menu->Append (ID_off, _("Off"));
+	_menu->Append (ID_full, _("Full"));
+	_menu->Append (ID_minus6dB, _("-6dB"));
+	_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, 1), ID_full);
+	Bind (wxEVT_MENU, boost::bind(&AudioMappingView::set_gain_from_menu, this, db_to_linear(-6)), ID_minus6dB);
+	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));
+}
+
+void
+AudioMappingView::size (wxSizeEvent& ev)
+{
+	setup ();
+	ev.Skip ();
+}
+
+void
+AudioMappingView::setup ()
 {
-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);
+	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));
+
+	_vertical_scroll->SetScrollbar (
+		_vertical_scroll->GetThumbPosition(),
+		s.GetHeight() - h - 8,
+		GRID_SPACING * (2 + _input_channels.size()),
+		GRID_SPACING,
+		true
+		);
+
+	_horizontal_scroll->SetScrollbar (
+		_horizontal_scroll->GetThumbPosition(),
+		s.GetWidth() - w - 8,
+		GRID_SPACING * (3 + _output_channels.size()),
+		GRID_SPACING,
+		true);
+}
+
+void
+AudioMappingView::scroll ()
+{
+	Refresh ();
+}
+
+void
+AudioMappingView::paint_static (wxDC& dc, wxGraphicsContext* gc)
+{
+	gc->SetAntialiasMode (wxANTIALIAS_DEFAULT);
+	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);
+	gc->SetPen (*wxBLACK_PEN);
+}
+
+void
+AudioMappingView::paint_column_labels (wxDC& dc, wxGraphicsContext* gc)
+{
+	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;
 	}
-};
 
-/** @class ValueRenderer
- *  @brief wxGridCellRenderer for a gain value.
- */
-class ValueRenderer : public wxGridCellRenderer
+	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);
+}
+
+void
+AudioMappingView::paint_column_lines (wxGraphicsContext* gc)
 {
-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 = 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);
+	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);
+	}
+	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);
+}
+
+void
+AudioMappingView::paint_row_labels (wxDC& dc, wxGraphicsContext* gc)
+{
+	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);
+		++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);
+	}
+
+	/* 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;
 		}
 
-		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);
+		{
+			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);
 		}
 
-		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));
+		lines.MoveToPoint    (GRID_SPACING,     y);
+		lines.AddLineToPoint (GRID_SPACING * 2, y);
+		y += height;
 	}
 
-	wxSize GetBestSize (wxGrid &, wxGridCellAttr &, wxDC &, int, int)
-	{
-		return wxSize (INDICATOR_SIZE + 4, INDICATOR_SIZE + 4);
+	lines.MoveToPoint    (GRID_SPACING,     y);
+	lines.AddLineToPoint (GRID_SPACING * 2, y);
+
+	gc->StrokePath (lines);
+}
+
+void
+AudioMappingView::paint_row_lines (wxGraphicsContext* gc)
+{
+	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);
 	}
-	
-	wxGridCellRenderer* Clone () const
-	{
-		return new ValueRenderer;
+	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);
+}
+
+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()));
+
+	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));
+			int const range = 18;
+			int height = 0;
+			if (value_dB > -range) {
+				height = INDICATOR_SIZE * (1 + value_dB / range);
+			}
+
+			dc.SetBrush (*wxTheBrushList->FindOrCreateBrush(wxColour (0, 255, 0), 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
+					)
+				);
+		}
 	}
-};
+}
 
+static
+void clip (wxDC& dc, wxGraphicsContext* gc, int x, int y, int w, int h)
+{
+	dc.SetClippingRegion (x, y, w, h);
+	gc->Clip (x, y, w, h);
+}
 
-AudioMappingView::AudioMappingView (wxWindow* parent)
-	: wxPanel (parent, wxID_ANY)
-	, _menu_row (0)
-	, _menu_column (1)
-	, _last_tooltip_row (0)
-	, _last_tooltip_column (0)
+static
+void translate (wxDC& dc, wxGraphicsContext* gc, int x, int y)
 {
-	_grid = new wxGrid (this, wxID_ANY);
+	gc->PushState ();
+	gc->Translate (-x, -y);
+	dc.SetLogicalOrigin (x, y);
+}
 
-	_grid->CreateGrid (0, MAX_DCP_AUDIO_CHANNELS + 1);
-	_grid->HideRowLabels ();
-	_grid->DisableDragRowSize ();
-	_grid->DisableDragColSize ();
-	_grid->EnableEditing (false);
-	_grid->SetCellHighlightPenWidth (0);
-	_grid->SetDefaultRenderer (new NoSelectionStringRenderer);
+static
+void restore (wxDC& dc, wxGraphicsContext* gc)
+{
+	dc.SetLogicalOrigin (0, 0);
+	gc->PopState ();
+	dc.DestroyClippingRegion ();
+	gc->ResetClip ();
+}
 
-	set_column_labels ();
+void
+AudioMappingView::paint ()
+{
+	wxPaintDC dc (_body);
 
-	_sizer = new wxBoxSizer (wxVERTICAL);
-	_sizer->Add (_grid, 1, wxEXPAND | wxALL);
-	SetSizerAndFit (_sizer);
+	wxGraphicsContext* gc = wxGraphicsContext::Create (dc);
+	if (!gc) {
+		return;
+	}
 
-	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));
+	int const hs = _horizontal_scroll->GetThumbPosition ();
+	int const vs = _vertical_scroll->GetThumbPosition ();
 
-	_menu = new wxMenu;
-	_menu->Append (ID_off, _("Off"));
-	_menu->Append (ID_full, _("Full"));
-	_menu->Append (ID_minus6dB, _("-6dB"));
-	_menu->Append (ID_edit, _("Edit..."));
+	paint_static (dc, gc);
 
-	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);
+	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_indicators (dc);
+	restore (dc, gc);
+
+	delete gc;
 }
 
-void
-AudioMappingView::map_changed ()
+optional<pair<int, int> >
+AudioMappingView::mouse_event_to_channels (wxMouseEvent& ev) const
 {
-	update_cells ();
-	Changed (_map);
-	_last_tooltip_column = -1;
-}	
+	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> >();
+	}
+
+	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> >();
+	}
+
+	return make_pair (input, output);
+}
+
+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>();
+	}
+
+	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;
+		}
+	}
+
+	return optional<string>();
+}
 
 void
-AudioMappingView::left_click (wxGridEvent& ev)
+AudioMappingView::left_down (wxMouseEvent& ev)
 {
-	if (ev.GetCol() == 0) {
+	optional<pair<int, int> > channels = mouse_event_to_channels (ev);
+	if (!channels) {
 		return;
 	}
 
-	dcp::Channel d = static_cast<dcp::Channel> (ev.GetCol() - 1);
-	
-	if (_map.get (ev.GetRow(), d) > 0) {
-		_map.set (ev.GetRow(), d, 0);
+	if (_map.get(channels->first, channels->second) > 0) {
+		_map.set (channels->first, channels->second, 0);
 	} else {
-		_map.set (ev.GetRow(), d, 1);
+		_map.set (channels->first, channels->second, 1);
 	}
 
-	map_changed ();
+	map_values_changed ();
 }
 
 void
-AudioMappingView::right_click (wxGridEvent& ev)
+AudioMappingView::right_down (wxMouseEvent& ev)
 {
-	if (ev.GetCol() == 0) {
+	optional<pair<int, int> > 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;
+	_menu_output = channels->second;
+	PopupMenu (_menu, ev.GetPosition());
 }
 
 void
-AudioMappingView::off ()
+AudioMappingView::mouse_wheel (wxMouseEvent& ev)
 {
-	_map.set (_menu_row, static_cast<dcp::Channel> (_menu_column - 1), 0);
-	map_changed ();
+	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::full ()
+AudioMappingView::map_values_changed ()
 {
-	_map.set (_menu_row, static_cast<dcp::Channel> (_menu_column - 1), 1);
-	map_changed ();
+	Changed (_map);
+	_last_tooltip_channels = optional<pair<int, int> >();
+	Refresh ();
 }
 
 void
-AudioMappingView::minus6dB ()
+AudioMappingView::set_gain_from_menu (double linear)
 {
-	_map.set (_menu_row, static_cast<dcp::Channel> (_menu_column - 1), pow (10, -6.0 / 20));
-	map_changed ();
+	_map.set (_menu_input, _menu_output, linear);
+	map_values_changed ();
 }
 
 void
 AudioMappingView::edit ()
 {
-	dcp::Channel d = static_cast<dcp::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 ();
+	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 ();
 	}
-	
+
 	dialog->Destroy ();
 }
 
@@ -225,146 +510,109 @@ void
 AudioMappingView::set (AudioMapping map)
 {
 	_map = map;
-	update_cells ();
+	Refresh ();
 }
 
 void
-AudioMappingView::update_cells ()
+AudioMappingView::set_input_channels (vector<string> const & names)
 {
-	if (_grid->GetNumberRows ()) {
-		_grid->DeleteRows (0, _grid->GetNumberRows ());
-	}
-
-	_grid->InsertRows (0, _map.content_channels ());
-
-	for (int i = 0; i < _map.content_channels(); ++i) {
-		for (int j = 0; j < MAX_DCP_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 (dcp::raw_convert<string> (_map.get (i, static_cast<dcp::Channel> (j - 1)))));
-		}
-	}
-
-	_grid->AutoSize ();
+	_input_channels = names;
+	setup ();
+	Refresh ();
 }
 
-/** @param c Number of DCP channels */
 void
-AudioMappingView::set_channels (int c)
+AudioMappingView::set_output_channels (vector<string> const & names)
 {
-	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 ();
-	}
-
-	update_cells ();
+	_output_channels = names;
+	setup ();
+	Refresh ();
 }
 
-void
-AudioMappingView::set_column_labels ()
+wxString
+AudioMappingView::safe_input_channel_name (int n) const
 {
-	int const c = _grid->GetNumberCols ();
-	
-	_grid->SetColLabelValue (0, _("Content"));
-
-#if MAX_DCP_AUDIO_CHANNELS != 12
-#warning AudioMappingView::set_column_labels() is expecting the wrong MAX_DCP_AUDIO_CHANNELS
-#endif	
-	
-	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"));
+	if (n >= int(_input_channels.size())) {
+		return wxString::Format ("%d", n + 1);
 	}
 
-	if (c > 6) {
-		_grid->SetColLabelValue (7, _("HI"));
-	}
-
-	if (c > 7) {
-		_grid->SetColLabelValue (8, _("VI"));
-	}
-
-	if (c > 8) {
-		_grid->SetColLabelValue (9, _("Lc"));
+	optional<wxString> group;
+	BOOST_FOREACH (Group i, _input_groups) {
+		if (i.from <= n && n <= i.to) {
+			group = std_to_wx (i.name);
+		}
 	}
 
-	if (c > 9) {
-		_grid->SetColLabelValue (10, _("Rc"));
+	if (group && !group->IsEmpty()) {
+		return wxString::Format ("%s/%s", group->data(), std_to_wx(_input_channels[n]).data());
 	}
 
-	if (c > 10) {
-		_grid->SetColLabelValue (11, _("BsL"));
-	}
+	return std_to_wx(_input_channels[n]);
+}
 
-	if (c > 11) {
-		_grid->SetColLabelValue (12, _("BsR"));
+wxString
+AudioMappingView::safe_output_channel_name (int n) const
+{
+	if (n >= int(_output_channels.size())) {
+		return wxString::Format ("%d", n + 1);
 	}
 
-	_grid->AutoSize ();
+	return std_to_wx(_output_channels[n]);
 }
 
 void
-AudioMappingView::mouse_moved (wxMouseEvent& ev)
+AudioMappingView::motion (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;
-	}
-
-	if (row != _last_tooltip_row || column != _last_tooltip_column) {
-
-		wxString s;
-		float const gain = _map.get (row, static_cast<dcp::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);
+	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 {
-			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);
+			SetToolTip ("");
 		}
-		
-		_grid->GetGridWindow()->SetToolTip (s + " " + _("Right click to change gain."));
-		_last_tooltip_row = row;
-		_last_tooltip_column = column;
 	}
 
+	_last_tooltip_channels = channels;
         ev.Skip ();
 }
+
+void
+AudioMappingView::set_input_groups (vector<Group> const & groups)
+{
+	_input_groups = groups;
+}