make RouteGroup gain control work again ; fix what solo button label shows under...

[ardour.git] / gtk2_ardour / mixer_strip.h

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index ced789f3ef81bb4a3cf88600c80926e888e35146..6b7ffb44cecf144567e6ea15a2cb2eb3b05b1d54 100644 (file)
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -94,8 +94,9 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        void fast_update ();
        void set_embedded (bool);
        
-       ARDOUR::RouteGroup* mix_group() const;
+       ARDOUR::RouteGroup* route_group() const;
        void set_route (boost::shared_ptr<ARDOUR::Route>);
+       void set_button_names ();
 
 #ifdef GTKOSX
        sigc::signal<void>      WidthChanged;
@@ -226,10 +227,10 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        void comment_edited ();
        bool ignore_comment_edit;
 
-       void set_mix_group (ARDOUR::RouteGroup *);
-       void add_mix_group_to_menu (ARDOUR::RouteGroup *, Gtk::RadioMenuItem::Group*);
-       bool select_mix_group (GdkEventButton *);
-       void mix_group_changed (void *);
+       void set_route_group (ARDOUR::RouteGroup *);
+       void add_route_group_to_menu (ARDOUR::RouteGroup *, Gtk::RadioMenuItem::Group*);
+       bool select_route_group (GdkEventButton *);
+       void route_group_changed (void *);
 
        IOSelectorWindow *input_selector;
        IOSelectorWindow *output_selector;
@@ -257,7 +258,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        boost::shared_ptr<ARDOUR::Delivery> _current_delivery;
        void revert_to_default_display ();
 
-       void set_mix_group_to_new ();
+       void set_route_group_to_new ();
 
        static int scrollbar_height;
 };