X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Faudio_mapping_view.h;h=88060e461817b4bd147d9e0907b40d417547be76;hp=2a2bacb00f48a757ef3827d6d689afc900b8e1e6;hb=1c4d14337cd061c0ef72f1fcde66be28235830ca;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05

diff --git a/src/wx/audio_mapping_view.h b/src/wx/audio_mapping_view.h
index 2a2bacb00..88060e461 100644
--- a/src/wx/audio_mapping_view.h
+++ b/src/wx/audio_mapping_view.h
@@ -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.
 
@@ -25,7 +25,6 @@
 
 #include <boost/signals2.hpp>
 #include <wx/wx.h>
-#include <wx/grid.h>
 #include "lib/audio_mapping.h"
 
 /** @class AudioMappingView
@@ -46,35 +45,74 @@
 class AudioMappingView : public wxPanel
 {
 public:
-	AudioMappingView (wxWindow *);
+	explicit AudioMappingView (wxWindow *, wxString left_label, wxString from, wxString top_label, wxString to);
 
 	void set (AudioMapping);
 	void set_input_channels (std::vector<std::string> const & names);
 	void set_output_channels (std::vector<std::string> const & names);
 
+	struct Group
+	{
+		Group (int f, int t, std::string n)
+			: from (f)
+			, to (t)
+			, name (n)
+		{}
+
+		/** First channel index (from 0) */
+		int from;
+		/** Last channel index (from 0) */
+		int to;
+		/** Name of this group */
+		std::string name;
+	};
+
+	void set_input_groups (std::vector<Group> const & groups);
+
 	boost::signals2::signal<void (AudioMapping)> Changed;
 
 private:
-	void left_click (wxGridEvent &);
-	void right_click (wxGridEvent &);
-	void mouse_moved (wxMouseEvent &);
-	void update_cells ();
 	void map_values_changed ();
-	void sized (wxSizeEvent &);
-
-	void off ();
-	void full ();
-	void minus6dB ();
+	void setup_sizes ();
+	void paint ();
+	void paint_static (wxDC& dc, wxGraphicsContext* gc);
+	void paint_column_labels (wxDC& dc, wxGraphicsContext* gc);
+	void paint_column_lines (wxGraphicsContext* gc);
+	void paint_row_labels (wxDC& dc, wxGraphicsContext* gc);
+	void paint_row_lines (wxGraphicsContext* gc);
+	void paint_indicators (wxDC& dc);
+	void size (wxSizeEvent &);
+	void scroll ();
+	void left_down (wxMouseEvent &);
+	void right_down (wxMouseEvent &);
+	void motion (wxMouseEvent &);
+	void mouse_wheel (wxMouseEvent &);
+	boost::optional<std::pair<int, int> > mouse_event_to_channels (wxMouseEvent& ev) const;
+	boost::optional<std::string> mouse_event_to_input_group_name (wxMouseEvent& ev) const;
+	void setup ();
+	wxString safe_input_channel_name (int n) const;
+	wxString safe_output_channel_name (int n) const;
+
+	void set_gain_from_menu (double linear);
 	void edit ();
 
-	wxGrid* _grid;
-	wxSizer* _sizer;
 	AudioMapping _map;
 
 	wxMenu* _menu;
-	int _menu_row;
-	int _menu_column;
-
-	int _last_tooltip_row;
-	int _last_tooltip_column;
+	wxPanel* _body;
+	wxScrollBar* _vertical_scroll;
+	wxScrollBar* _horizontal_scroll;
+	int _menu_input;
+	int _menu_output;
+
+	wxString _left_label;
+	wxString _from;
+	wxString _top_label;
+	wxString _to;
+
+	std::vector<std::string> _input_channels;
+	std::vector<std::string> _output_channels;
+	std::vector<Group> _input_groups;
+
+	boost::optional<std::pair<int, int> > _last_tooltip_channels;
 };