X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_mapping_view.h;h=873fc5c93800fd74d5e761165fdbd712ecb49b9f;hb=6d686ea45f5cd01a0d11f92a903ac77779ad8562;hp=98b666999757ac7f7feafd5a022b5fe79e5502d6;hpb=7a283ed23bb4189046884de0c49853bf3585d94d;p=dcpomatic.git

diff --git a/src/wx/audio_mapping_view.h b/src/wx/audio_mapping_view.h
index 98b666999..873fc5c93 100644
--- a/src/wx/audio_mapping_view.h
+++ b/src/wx/audio_mapping_view.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,19 +18,21 @@
 
 */
 
+
 /** @file  src/wx/audio_mapping_view.h
  *  @brief AudioMappingView class.
- *
  */
 
+
 #include "lib/audio_mapping.h"
 #include "lib/types.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
+
 /** @class AudioMappingView
  *  @brief This class displays the mapping of one set of audio channels to another,
  *  with gain values on each node of the map.
@@ -45,7 +47,6 @@ DCPOMATIC_ENABLE_WARNINGS
  *  hidden from view.  Thus input channels are never hidden but output channels
  *  might be.
  */
-
 class AudioMappingView : public wxPanel
 {
 public:
@@ -77,7 +78,6 @@ public:
 
 private:
 	void map_values_changed ();
-	void setup_sizes ();
 	void paint ();
 	void paint_static (wxDC& dc);
 	void paint_column_labels (wxDC& dc);
@@ -91,7 +91,7 @@ private:
 	void right_down (wxMouseEvent &);
 	void motion (wxMouseEvent &);
 	void mouse_wheel (wxMouseEvent &);
-	boost::optional<std::pair<NamedChannel, NamedChannel> > 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 input_channel_name_with_group (NamedChannel const& n) const;
@@ -116,6 +116,8 @@ private:
 	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<NamedChannel, NamedChannel>> _last_tooltip_channels;
 };