X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_mapping_view.h;h=873fc5c93800fd74d5e761165fdbd712ecb49b9f;hb=865316f0129c85cdd0248b87502fe97dec94b3f0;hp=fd8a16d5c667d3645c1b02e4aaabe1d12104d136;hpb=a19daa1abebf1a8e9e942387d2319a778187c0d3;p=dcpomatic.git

diff --git a/src/wx/audio_mapping_view.h b/src/wx/audio_mapping_view.h
index fd8a16d5c..873fc5c93 100644
--- a/src/wx/audio_mapping_view.h
+++ b/src/wx/audio_mapping_view.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,14 +18,20 @@
 
 */
 
+
 /** @file  src/wx/audio_mapping_view.h
  *  @brief AudioMappingView class.
- *
  */
 
-#include <boost/signals2.hpp>
-#include <wx/wx.h>
+
 #include "lib/audio_mapping.h"
+#include "lib/types.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
+#include <boost/signals2.hpp>
+
 
 /** @class AudioMappingView
  *  @brief This class displays the mapping of one set of audio channels to another,
@@ -41,15 +47,14 @@
  *  hidden from view.  Thus input channels are never hidden but output channels
  *  might be.
  */
-
 class AudioMappingView : public wxPanel
 {
 public:
-	explicit AudioMappingView (wxWindow *);
+	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);
+	void set_input_channels (std::vector<NamedChannel> const& channels);
+	void set_output_channels (std::vector<NamedChannel> const& channels);
 
 	struct Group
 	{
@@ -73,13 +78,12 @@ public:
 
 private:
 	void map_values_changed ();
-	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_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 ();
@@ -87,29 +91,33 @@ private:
 	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::pair<NamedChannel, NamedChannel>> 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;
+	wxString input_channel_name_with_group (NamedChannel const& n) const;
 
-	void off ();
-	void full ();
-	void minus6dB ();
+	void set_gain_from_menu (double linear);
 	void edit ();
 
 	AudioMapping _map;
 
-	wxMenu* _menu;
-	wxPanel* _body;
-	wxScrollBar* _vertical_scroll;
-	wxScrollBar* _horizontal_scroll;
+	wxMenu* _menu = nullptr;
+	wxPanel* _body = nullptr;
+	wxScrollBar* _vertical_scroll = nullptr;
+	wxScrollBar* _horizontal_scroll = nullptr;
 	int _menu_input;
 	int _menu_output;
 
-	std::vector<std::string> _input_channels;
-	std::vector<std::string> _output_channels;
+	wxString _left_label;
+	wxString _from;
+	wxString _top_label;
+	wxString _to;
+
+	std::vector<NamedChannel> _input_channels;
+	std::vector<NamedChannel> _output_channels;
 	std::vector<Group> _input_groups;
+	std::vector<int> _column_widths;
+	int _column_widths_total = 0;
 
-	boost::optional<std::pair<int, int> > _last_tooltip_channels;
+	boost::optional<std::pair<NamedChannel, NamedChannel>> _last_tooltip_channels;
 };