Move selection/punch clocks to editor Sidebar

[ardour.git] / gtk2_ardour / mixer_strip.h

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 0d815c4b3e5448cd36a0b0286b78870dddafe050..7ee8db0b17c9d1b284d5ff6e112c95423959d4a0 100644 (file)
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -88,6 +88,8 @@ class MixerStrip : public AxisView, public RouteUI, public Gtk::EventBox
        bool marked_for_display () const;
        bool set_marked_for_display (bool);
 
+       boost::shared_ptr<ARDOUR::Stripable> stripable() const { return RouteUI::stripable(); }
+
        void set_width_enum (Width, void* owner);
        Width get_width_enum () const { return _width; }
        void* width_owner () const { return _width_owner; }
@@ -138,7 +140,7 @@ class MixerStrip : public AxisView, public RouteUI, public Gtk::EventBox
        void toggle_processors ();
        void ab_plugins ();
 
-       void show_selected ();
+       void set_selected (bool yn);
 
        static MixerStrip* entered_mixer_strip() { return _entered_mixer_strip; }
 
@@ -164,7 +166,7 @@ class MixerStrip : public AxisView, public RouteUI, public Gtk::EventBox
        ArdourButton         width_button;
        ArdourButton         number_label;
        Gtk::HBox           width_hide_box;
-       Gtk::EventBox*      spacer;
+       Gtk::EventBox           spacer;
 
        void hide_clicked();
        bool width_button_pressed (GdkEventButton *);
@@ -251,6 +253,7 @@ class MixerStrip : public AxisView, public RouteUI, public Gtk::EventBox
        PBD::ScopedConnection panstyle_connection;
        void connect_to_pan ();
        void update_panner_choices ();
+       void update_trim_control ();
 
        void update_diskstream_display ();
        void update_input_display ();
@@ -261,7 +264,6 @@ class MixerStrip : public AxisView, public RouteUI, public Gtk::EventBox
        Gtk::Menu* route_ops_menu;
        void build_route_ops_menu ();
        gboolean name_button_button_press (GdkEventButton*);
-       gboolean name_button_button_release (GdkEventButton*);
        gboolean number_button_button_press (GdkEventButton*);
        void list_route_operations ();