Hide warnings triggered by Ubuntu 20.04's gcc.

[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 a96757b5c986c49f049061e6a0734a74c34f08ce..e20e5289bc30901948d51a7d4b1a8a779fe8f927 100644 (file)
--- 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-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -23,9 +23,12 @@
  *
  */
 
-#include <boost/signals2.hpp>
-#include <wx/wx.h>
 #include "lib/audio_mapping.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
+#include <boost/signals2.hpp>
 
 /** @class AudioMappingView
  *  @brief This class displays the mapping of one set of audio channels to another,
@@ -45,7 +48,7 @@
 class AudioMappingView : public wxPanel
 {
 public:
-       explicit 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);
@@ -75,11 +78,11 @@ 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 ();
@@ -90,10 +93,10 @@ private:
        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 off ();
-       void full ();
-       void minus6dB ();
+       void set_gain_from_menu (double linear);
        void edit ();
 
        AudioMapping _map;
@@ -105,6 +108,11 @@ private:
        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;