Use bound arguments to lose some methods.

diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index 937dea5588b453e9992e9c991c4ff94f9f86441d..df2759ef6b97021dadd2802b82fe035ec961ac13 100644 (file)
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -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.
 
@@ -84,9 +84,9 @@ AudioMappingView::AudioMappingView (wxWindow* parent, wxString left_label, wxStr
 #endif
 
        Bind (wxEVT_SIZE, boost::bind(&AudioMappingView::size, this, _1));
-       Bind (wxEVT_MENU, boost::bind(&AudioMappingView::off, this), ID_off);
-       Bind (wxEVT_MENU, boost::bind(&AudioMappingView::full, this), ID_full);
-       Bind (wxEVT_MENU, boost::bind(&AudioMappingView::minus6dB, this), ID_minus6dB);
+       Bind (wxEVT_MENU, boost::bind(&AudioMappingView::set_gain_from_menu, this, 0), ID_off);
+       Bind (wxEVT_MENU, boost::bind(&AudioMappingView::set_gain_from_menu, this, 1), ID_full);
+       Bind (wxEVT_MENU, boost::bind(&AudioMappingView::set_gain_from_menu, this, db_to_linear(-6)), ID_minus6dB);
        Bind (wxEVT_MENU, boost::bind(&AudioMappingView::edit, this), ID_edit);
        Bind (wxEVT_MOUSEWHEEL, boost::bind(&AudioMappingView::mouse_wheel, this, _1));
        _body->Bind (wxEVT_PAINT, boost::bind(&AudioMappingView::paint, this));
@@ -488,23 +488,9 @@ AudioMappingView::map_values_changed ()
 }
 
 void
-AudioMappingView::off ()
+AudioMappingView::set_gain_from_menu (double linear)
 {
-       _map.set (_menu_input, _menu_output, 0);
-       map_values_changed ();
-}
-
-void
-AudioMappingView::full ()
-{
-       _map.set (_menu_input, _menu_output, 1);
-       map_values_changed ();
-}
-
-void
-AudioMappingView::minus6dB ()
-{
-       _map.set (_menu_input, _menu_output, db_to_linear(-6));
+       _map.set (_menu_input, _menu_output, linear);
        map_values_changed ();
 }
 

diff --git a/src/wx/audio_mapping_view.h b/src/wx/audio_mapping_view.h
index aab6f64a61f7513f9dbf6d110b48711cd24014f9..88060e461817b4bd147d9e0907b40d417547be76 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.
 
@@ -93,9 +93,7 @@ private:
        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;