Use bound arguments to lose some methods.

[dcpomatic.git] / src / wx / audio_mapping_view.h

diff --git a/src/wx/audio_mapping_view.h b/src/wx/audio_mapping_view.h
index a1d33ccd61b1fe4b8eefe7a0377a9139d70bc8f6..88060e461817b4bd147d9e0907b40d417547be76 100644 (file)
--- 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-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,7 +45,7 @@
 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);
@@ -73,34 +72,47 @@ 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 off ();
-       void full ();
-       void minus6dB ();
+       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;
-       wxPanel* _left_labels;
-       wxPanel* _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;
+
+       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;
-       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;
 };