Unify the canvases by moving groups around rather than using set_scrolling_region...

[ardour.git] / gtk2_ardour / mixer_strip.h

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 88115c6063d6d78572e1ce02397e830f8026a0f5..464ec514336947d09ff178062e7ffdfa8bcf4497 100644 (file)
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -85,12 +85,13 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        MixerStrip (Mixer_UI&, ARDOUR::Session&, boost::shared_ptr<ARDOUR::Route>, bool in_mixer = true);
        ~MixerStrip ();
 
-       void set_width (Width);
+       void set_width (Width, void* owner);
        Width get_width() const { return _width; }
+       void* width_owner() const { return _width_owner; }
 
        void fast_update ();
        void set_embedded (bool);
-
+       
        ARDOUR::RouteGroup* mix_group() const;
 
   protected:
@@ -106,11 +107,14 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 
        bool  _embedded;
        bool  _packed;
+       bool  _mixer_owned;
        Width _width;
+       void*  _width_owner;
 
        Gtk::Button         hide_button;
        Gtk::Button         width_button;
        Gtk::HBox           width_hide_box;
+       Gtk::EventBox       top_event_box;
 
        void hide_clicked();
        void width_clicked ();
@@ -121,7 +125,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        RedirectBox pre_redirect_box;
        RedirectBox post_redirect_box;
        GainMeter   gpm;
-               PannerUI    panners;
+       PannerUI    panners;
        
        Gtk::Table button_table;
        Gtk::Table middle_button_table;
@@ -153,7 +157,6 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        Gtk::TextView* comment_area;
        Gtk::Button    comment_button;
 
-       void comment_button_refresh();
        void comment_editor_done_editing();
        void setup_comment_editor ();
        void comment_button_clicked ();
@@ -238,15 +241,14 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        void update_speed_display ();
        void map_frozen ();
        void hide_redirect_editor (boost::shared_ptr<ARDOUR::Redirect> redirect);
+       void hide_redirect_editors ();
 
        bool ignore_speed_adjustment;
 
-       string solo_button_name () const { return "MixerSoloButton"; }
-       string safe_solo_button_name () const { return "MixerSafeSoloButton"; }
-
        void engine_running();
        void engine_stopped();
 
+       static int scrollbar_height;
 };
 
 #endif /* __ardour_mixer_strip__ */