PBD::Signal<...>::connect() is already thread safe, so drop intermediate proxy/call_s...

[ardour.git] / gtk2_ardour / monitor_section.h

diff --git a/gtk2_ardour/monitor_section.h b/gtk2_ardour/monitor_section.h
index 8a3c23a6c615f6cca1d11d21ab917ffbaf36d2aa..b58203f52164148859183564d5ef8947be9ea443 100644 (file)
--- a/gtk2_ardour/monitor_section.h
+++ b/gtk2_ardour/monitor_section.h
@@ -61,8 +61,8 @@ class MonitorSection : public RouteUI, public Gtk::EventBox
        Gtk::HBox  channel_table_packer;
        Gtk::HBox  table_hpacker;
        Gtk::HBox  master_packer;
-       Gtk::Table channel_table;
        Gtk::Table channel_table_header;
+       Gtk::Table *channel_table;
        Gtk::ScrolledWindow channel_table_scroller;
        Gtk::Viewport channel_table_viewport;
        Glib::RefPtr<Gtk::SizeGroup> channel_size_group;
@@ -106,9 +106,30 @@ class MonitorSection : public RouteUI, public Gtk::EventBox
        boost::shared_ptr<ARDOUR::MonitorProcessor> _monitor;
        boost::shared_ptr<ARDOUR::Route> _route;
 
+       enum MonitorActions {
+               MonitorMono,
+               MonitorCutAll,
+               MonitorDimAll,
+               ToggleExclusiveSolo,
+               ToggleMuteOverridesSolo,
+               SoloUseInPlace,
+               SoloUseAFL,
+               SoloUsePFL,
+               ToggleMonitorProcessorBox
+       };
+
+       enum ChannelActions {
+               CutChannel,
+               DimChannel,
+               SoloChannel,
+               InvertChannel
+       };
+
        static Glib::RefPtr<Gtk::ActionGroup> monitor_actions;
-       void register_actions ();
-       void connect_actions ();
+       static void register_actions ();
+
+       static void action_proxy0 (enum MonitorActions);
+       static void action_proxy1 (enum ChannelActions, uint32_t);
 
        void cut_channel (uint32_t);
        void dim_channel (uint32_t);
@@ -157,7 +178,7 @@ class MonitorSection : public RouteUI, public Gtk::EventBox
 
        PBD::ScopedConnection config_connection;
        PBD::ScopedConnectionList control_connections;
-       PBD::ScopedConnection _output_changed_connection;
+       PBD::ScopedConnectionList output_changed_connections;
 
        bool _inhibit_solo_model_update;
 
@@ -179,11 +200,10 @@ class MonitorSection : public RouteUI, public Gtk::EventBox
        Glib::RefPtr<Gtk::Action> proctoggle;
        bool _ui_initialized;
 
-  private:
-       Gtkmm2ext::ActionMap myactions;
-       Gtkmm2ext::Bindings* bindings;
+       static Gtkmm2ext::ActionMap myactions;
+       static Gtkmm2ext::Bindings* bindings;
 
-       void load_bindings ();
+       static void load_bindings ();
        bool enter_handler (GdkEventCrossing*);
        bool leave_handler (GdkEventCrossing*);
 };