cleanup a couple of audio file format names as reported by libsndfile

[ardour.git] / gtk2_ardour / mixer_strip.h

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 21db0d14ca83b4a17dd6b8234b5046e2c674bb80..01de819d5cb8272f949fade086ec2aff40d883b5 100644 (file)
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -83,15 +83,22 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 {
   public:
        MixerStrip (Mixer_UI&, ARDOUR::Session&, boost::shared_ptr<ARDOUR::Route>, bool in_mixer = true);
+       MixerStrip (Mixer_UI&, ARDOUR::Session&, 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;
+       void set_route (boost::shared_ptr<ARDOUR::Route>);
+
+#ifdef GTKOSX
+       sigc::signal<void>      WidthChanged;
+#endif
 
   protected:
        friend class Mixer_UI;
@@ -104,13 +111,18 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
   private:
        Mixer_UI& _mixer;
 
+       void init ();
+
        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 +133,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,6 +165,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        Gtk::TextView* comment_area;
        Gtk::Button    comment_button;
 
+       void comment_editor_done_editing();
        void setup_comment_editor ();
        void comment_button_clicked ();
 
@@ -197,6 +210,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        void set_automated_controls_sensitivity (bool yn);
 
        Gtk::Menu* route_ops_menu;
+       Gtk::MenuItem* rename_menu_item;
        void build_route_ops_menu ();
        gint name_button_button_press (GdkEventButton*);
        void list_route_operations ();
@@ -236,15 +250,16 @@ 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;
+       
+       void update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width width, bool input_button);
 };
 
 #endif /* __ardour_mixer_strip__ */