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 65be3c00c1f1a96f26a3d187d8123282e575d84d..01de819d5cb8272f949fade086ec2aff40d883b5 100644 (file)
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000 Paul Davis
+    Copyright (C) 2000-2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -14,8 +14,6 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
 */
 
 #ifndef __ardour_mixer_strip__
@@ -37,14 +35,15 @@
 #include <gtkmm/adjustment.h>
 
 #include <gtkmm2ext/auto_spin.h>
-#include <gtkmm2ext/slider_controller.h>
 #include <gtkmm2ext/click_box.h>
+#include <gtkmm2ext/slider_controller.h>
+
+#include <pbd/stateful.h>
 
 #include <ardour/types.h>
 #include <ardour/ardour.h>
 #include <ardour/io.h>
 #include <ardour/insert.h>
-#include <ardour/stateful.h>
 #include <ardour/redirect.h>
 
 #include <pbd/fastlog.h>
@@ -83,16 +82,23 @@ class Mixer_UI;
 class MixerStrip : public RouteUI, public Gtk::EventBox
 {
   public:
-       MixerStrip (Mixer_UI&, ARDOUR::Session&, ARDOUR::Route &, bool in_mixer = true);
+       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;
@@ -105,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 ();
@@ -122,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;
@@ -154,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 ();
 
@@ -170,15 +182,13 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        Gtk::Menu output_menu;
        void add_connection_to_output_menu (ARDOUR::Connection *);
        
-       void stream_input_chosen (ARDOUR::DiskStream*);
-       void select_stream_input ();
        void connection_input_chosen (ARDOUR::Connection *);
        void connection_output_chosen (ARDOUR::Connection *);
 
        void edit_input_configuration ();
        void edit_output_configuration ();
 
-       void diskstream_changed (void *src);
+       void diskstream_changed ();
 
        Gtk::Menu *send_action_menu;
        void build_send_action_menu ();
@@ -200,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 ();
@@ -238,16 +249,17 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        void name_changed (void *src);
        void update_speed_display ();
        void map_frozen ();
-       void hide_redirect_editor (ARDOUR::Redirect* redirect);
+       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__ */