rationalize destruction pathway (some more); tidy-ify some ImageFrame code

[ardour.git] / gtk2_ardour / mixer_strip.h

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index d1ab3c398e7d2fa7a0027a2483bc92612d43e74c..acb69534b3d590b667e1076590bd8a416f059aa2 100644 (file)
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -79,27 +79,30 @@ class RouteGroupMenu;
 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 (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_enum (Width, void* owner);
        Width get_width_enum () const { return _width; }
        void* width_owner () const { return _width_owner; }
 
-       GainMeter& gain_meter() { return gpm; }
-       PannerUI&  panner_ui()  { return panners; }
+       GainMeter&      gain_meter()      { return gpm; }
+       PannerUI&       panner_ui()       { return panners; }
+       PluginSelector* plugin_selector();
 
        void fast_update ();
        void set_embedded (bool);
-       
+
        ARDOUR::RouteGroup* route_group() const;
        void set_route (boost::shared_ptr<ARDOUR::Route>);
        void set_button_names ();
+       void show_send (boost::shared_ptr<ARDOUR::Send>);
 
        sigc::signal<void>      WidthChanged;
 
        static sigc::signal<void,boost::shared_ptr<ARDOUR::Route> > SwitchIO;
+       static PBD::Signal1<void,MixerStrip*> CatchDeletion;
 
   protected:
        friend class Mixer_UI;
@@ -142,7 +145,8 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        ProcessorBox processor_box;
        GainMeter   gpm;
        PannerUI    panners;
-       
+       Gtk::ToggleButton _mono_button;
+
        Gtk::Table button_table;
        Gtk::Table middle_button_table;
        Gtk::Table bottom_button_table;
@@ -162,11 +166,11 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        Gtk::Button output_button;
        Gtk::Label  output_label;
 
-       sigc::connection newplug_connection;
-    
+       std::string longest_label;
+
        gint    mark_update_safe ();
        guint32 mode_switch_in_progress;
-       
+
        Gtk::Button   name_button;
 
        ArdourDialog*  comment_window;
@@ -176,6 +180,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        void comment_editor_done_editing();
        void setup_comment_editor ();
        void comment_button_clicked ();
+       void mono_button_clicked ();
 
        Gtk::Button   group_button;
        Gtk::Label    group_label;
@@ -184,12 +189,14 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        gint input_press (GdkEventButton *);
        gint output_press (GdkEventButton *);
 
-       Gtk::Menu  input_menu;
+       Gtk::Menu input_menu;
+       std::list<boost::shared_ptr<ARDOUR::Bundle> > input_menu_bundles;
        void maybe_add_bundle_to_input_menu (boost::shared_ptr<ARDOUR::Bundle>, ARDOUR::BundleList const &);
 
        Gtk::Menu output_menu;
+       std::list<boost::shared_ptr<ARDOUR::Bundle> > output_menu_bundles;
        void maybe_add_bundle_to_output_menu (boost::shared_ptr<ARDOUR::Bundle>, ARDOUR::BundleList const &);
-       
+
        void bundle_input_toggled (boost::shared_ptr<ARDOUR::Bundle>);
        void bundle_output_toggled (boost::shared_ptr<ARDOUR::Bundle>);
 
@@ -208,8 +215,8 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        void input_changed (ARDOUR::IOChange, void *);
        void output_changed (ARDOUR::IOChange, void *);
 
-       sigc::connection panstate_connection;
-       sigc::connection panstyle_connection;
+       PBD::ScopedConnection panstate_connection;
+       PBD::ScopedConnection panstyle_connection;
        void connect_to_pan ();
 
        void update_diskstream_display ();
@@ -230,7 +237,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 
        void set_route_group (ARDOUR::RouteGroup *);
        bool select_route_group (GdkEventButton *);
-       void route_group_changed (void *);
+       void route_group_changed ();
 
        IOSelectorWindow *input_selector;
        IOSelectorWindow *output_selector;
@@ -258,8 +265,13 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
        boost::shared_ptr<ARDOUR::Delivery> _current_delivery;
        void revert_to_default_display ();
 
+       void drop_send ();
+       PBD::ScopedConnection send_gone_connection;
+
+       void reset_strip_style ();
+
        static int scrollbar_height;
-       
+
        void update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width width, bool input_button);
 };