change tooltip for group tab to suggest click-to-(de)activate

[ardour.git] / gtk2_ardour / mixer_strip.h

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 64579e0c33864b9e0c242d00bd3337acaea42241..bbebbcaf15e0791a6b77604dde42cb64bc64f97b 100644 (file)
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -99,9 +99,14 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        void set_button_names ();
        void show_send (boost::shared_ptr<ARDOUR::Send>);
 
+       bool mixer_owned () const {
+               return _mixer_owned;
+       }
+
        sigc::signal<void>      WidthChanged;
 
        static sigc::signal<void,boost::shared_ptr<ARDOUR::Route> > SwitchIO;
+       static PBD::Signal1<void,MixerStrip*> CatchDeletion;
 
   protected:
        friend class Mixer_UI;
@@ -147,6 +152,8 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        Gtk::ToggleButton _mono_button;
 
        Gtk::Table button_table;
+        Gtk::Table solo_led_table;
+        Gtk::HBox  solo_led_box;
        Gtk::Table middle_button_table;
        Gtk::Table bottom_button_table;
 
@@ -155,7 +162,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        Gtk::Button                  meter_point_button;
        Gtk::Label                   meter_point_label;
 
-       void meter_changed (void *);
+       void meter_changed ();
 
        Gtk::Button diskstream_button;
        Gtk::Label  diskstream_label;
@@ -214,8 +221,8 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        void input_changed (ARDOUR::IOChange, void *);
        void output_changed (ARDOUR::IOChange, void *);
 
-       boost::signals2::scoped_connection panstate_connection;
-       boost::signals2::scoped_connection panstyle_connection;
+       PBD::ScopedConnection panstate_connection;
+       PBD::ScopedConnection panstyle_connection;
        void connect_to_pan ();
 
        void update_diskstream_display ();
@@ -226,7 +233,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 
        Gtk::Menu* route_ops_menu;
        void build_route_ops_menu ();
-       gint name_button_button_press (GdkEventButton*);
+       gboolean name_button_button_press (GdkEventButton*);
        void list_route_operations ();
 
        gint comment_key_release_handler (GdkEventKey*);
@@ -265,7 +272,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        void revert_to_default_display ();
 
        void drop_send ();
-       boost::signals2::scoped_connection send_gone_connection;
+       PBD::ScopedConnection send_gone_connection;
 
        void reset_strip_style ();