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 fdd56921111d76e959f3a5b4e20b5b4b98473848..6b7ffb44cecf144567e6ea15a2cb2eb3b05b1d54 100644 (file)
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -84,20 +84,26 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        MixerStrip (Mixer_UI&, ARDOUR::Session&, bool in_mixer = true);
        ~MixerStrip ();
 
-       void set_width (Width, void* owner);
-       Width get_width() const { return _width; }
-       void* width_owner() const { return _width_owner; }
+       void set_width_enum (Width, void* owner);
+       Width get_width_enum () const { return _width; }
+       void* width_owner () const { return _width_owner; }
+
+       GainMeter& gain_meter() { return gpm; }
+       PannerUI&  panner_ui()  { return panners; }
 
        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;
 #endif
 
+       static sigc::signal<void,boost::shared_ptr<ARDOUR::Route> > SwitchIO;
+
   protected:
        friend class Mixer_UI;
        void set_packed (bool yn);
@@ -221,31 +227,22 @@ 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;
 
        Gtk::Style *passthru_style;
 
-       void route_gui_changed (string, void*);
+       void route_gui_changed (std::string, void*);
        void show_route_color ();
        void show_passthru_color ();
 
        void route_active_changed ();
 
-       /* speed control (for tracks only) */
-
-       Gtk::Adjustment    speed_adjustment;
-       Gtkmm2ext::ClickBox speed_spinner;
-       Gtk::Label         speed_label;
-       Gtk::Frame         speed_frame;
-
-       void speed_adjustment_changed ();
-       void speed_changed ();
        void name_changed ();
        void update_speed_display ();
        void map_frozen ();
@@ -257,6 +254,12 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        void engine_running();
        void engine_stopped();
 
+       void switch_io (boost::shared_ptr<ARDOUR::Route>);
+       boost::shared_ptr<ARDOUR::Delivery> _current_delivery;
+       void revert_to_default_display ();
+
+       void set_route_group_to_new ();
+
        static int scrollbar_height;
 };