many changes associated with rationalizing selection flow

[ardour.git] / gtk2_ardour / mixer_ui.h

diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index 1be03132ccfccd5e8e8d21cb6de091b871937859..70a0e630b73d9ac53fbc7fe11314837af1120e38 100644 (file)
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -121,7 +121,7 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
        sigc::signal1<void,boost::shared_ptr<ARDOUR::VCA> > show_vca_change;
 
   protected:
-       void set_route_targets_for_operation ();
+       void set_axis_targets_for_operation ();
 
   private:
        Mixer_UI ();
@@ -148,7 +148,10 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
        Gtkmm2ext::HPane      inner_pane;
        Gtk::HBox             strip_packer;
        Gtk::ScrolledWindow   vca_scroller;
-       Gtk::HBox             vca_packer;
+       Gtk::HBox             vca_hpacker;
+       Gtk::VBox             vca_vpacker;
+       Gtk::EventBox         vca_label_bar;
+       Gtk::Label            vca_label;
        Gtk::EventBox         vca_scroller_base;
        Gtk::HBox             out_packer;
        Gtkmm2ext::HPane      list_hpane;
@@ -174,7 +177,8 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
        void add_masters (ARDOUR::VCAList&);
        void remove_master (VCAMasterStrip*);
 
-       MixerStrip* strip_by_route (boost::shared_ptr<ARDOUR::Route>);
+       MixerStrip* strip_by_route (boost::shared_ptr<ARDOUR::Route>) const;
+       AxisView* axis_by_stripable (boost::shared_ptr<ARDOUR::Stripable>) const;
 
        void hide_all_strips (bool with_select);
        void unselect_all_strips();
@@ -263,7 +267,7 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
         MonitorSection* _monitor_section;
        PluginSelector    *_plugin_selector;
 
-       void strip_property_changed (const PBD::PropertyChange&, MixerStrip *);
+       void stripable_property_changed (const PBD::PropertyChange& what_changed, boost::weak_ptr<ARDOUR::Stripable> ws);
        void route_group_property_changed (ARDOUR::RouteGroup *, const PBD::PropertyChange &);
 
        /* various treeviews */