X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_mapping_view.h;h=ffb8c9ed938d045a94e57b1fdda13a811b825950;hb=428ced8015bca308c34d109b5244b08a8287d5a0;hp=f45c2480ccd29c24442612cbd0a9eed0b159ce28;hpb=82e99f2294e9e8c382446a86e854b80f43dbaac9;p=dcpomatic.git

diff --git a/src/wx/audio_mapping_view.h b/src/wx/audio_mapping_view.h
index f45c2480c..ffb8c9ed9 100644
--- a/src/wx/audio_mapping_view.h
+++ b/src/wx/audio_mapping_view.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2019 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
@@ -73,35 +72,42 @@ public:
 	boost::signals2::signal<void (AudioMapping)> Changed;
 
 private:
-	void left_click (wxGridEvent &);
-	void right_click (wxGridEvent &);
-	void mouse_moved_grid (wxMouseEvent &);
-	void update_cells ();
 	void map_values_changed ();
-	void sized (wxSizeEvent &);
-	void paint_left_labels ();
-	void paint_top_labels ();
-	void mouse_moved_left_labels (wxMouseEvent &);
 	void setup_sizes ();
-	void grid_scrolled (wxScrollWinEvent& ev);
+	void paint ();
+	void paint_static (wxDC& dc);
+	void paint_column_labels (wxDC& dc);
+	void paint_column_lines (wxDC& dc);
+	void paint_row_labels (wxDC& dc);
+	void paint_row_lines (wxDC& dc);
+	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 ();
 
 	void off ();
 	void full ();
 	void minus6dB ();
 	void edit ();
 
-	wxGrid* _grid;
-	wxScrolledCanvas* _left_labels;
-	wxScrolledCanvas* _top_labels;
 	AudioMapping _map;
 
 	wxMenu* _menu;
-	int _menu_row;
-	int _menu_column;
-
+	wxPanel* _body;
+	wxScrollBar* _vertical_scroll;
+	wxScrollBar* _horizontal_scroll;
+	int _menu_input;
+	int _menu_output;
+
+	std::vector<std::string> _input_channels;
+	std::vector<std::string> _output_channels;
 	std::vector<Group> _input_groups;
-	std::vector<std::pair<int, int> > _input_group_positions;
 
-	int _last_tooltip_row;
-	int _last_tooltip_column;
+	boost::optional<std::pair<int, int> > _last_tooltip_channels;
 };