Fix crash on updating route IOs, and clean up confusing method names slightly.

[ardour.git] / gtk2_ardour / panner_ui.h

diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h
index bebffec6c00d532501d1d7b80a2b43e0bb2ddff4..0e16d01a64601a8c8157c10d6fafd618d6343908 100644 (file)
--- a/gtk2_ardour/panner_ui.h
+++ b/gtk2_ardour/panner_ui.h
@@ -33,6 +33,8 @@
 #include <gtkmm2ext/click_box.h>
 #include <gtkmm2ext/slider_controller.h>
 
+#include "ardour/session_handle.h"
+
 #include "enums.h"
 
 class Panner2d;
@@ -43,7 +45,9 @@ namespace ARDOUR {
        class Session;
        class Panner;
        class Delivery;
+        class AutomationControl;
 }
+
 namespace Gtkmm2ext {
        class FastMeter;
 }
@@ -53,15 +57,15 @@ namespace Gtk {
        class Menuitem;
 }
 
-class PannerUI : public Gtk::HBox
+class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 {
   public:
-       PannerUI (ARDOUR::Session&);
+       PannerUI (ARDOUR::Session*);
        ~PannerUI ();
 
        virtual void set_panner (boost::shared_ptr<ARDOUR::Panner>);
 
-       void pan_changed (void *);
+       void panner_changed (void *);
 
        void update_pan_sensitive ();
        void update_gain_sensitive ();
@@ -80,8 +84,8 @@ class PannerUI : public Gtk::HBox
        friend class MixerStrip;
 
        boost::shared_ptr<ARDOUR::Panner> _panner;
-       ARDOUR::Session& _session;
-       std::vector<sigc::connection> connections;
+       PBD::ScopedConnectionList connections;
+       PBD::ScopedConnectionList _pan_control_connections;
 
        bool ignore_toggle;
        bool in_pan_update;
@@ -90,7 +94,7 @@ class PannerUI : public Gtk::HBox
 
        static const int pan_bar_height;
 
-       Panner2d*       panner;
+       Panner2d*       twod_panner; ///< 2D panner, or 0
        Panner2dWindow* big_window;
 
        Gtk::VBox           pan_bar_packer;
@@ -130,8 +134,6 @@ class PannerUI : public Gtk::HBox
        void build_astate_menu ();
        void build_astyle_menu ();
 
-       void panner_changed ();
-
        void hide_pans ();
 
        void panner_moved (int which);
@@ -142,6 +144,8 @@ class PannerUI : public Gtk::HBox
 
        bool pan_button_event (GdkEventButton*, uint32_t which);
 
+       void connect_to_pan_control (uint32_t);
+
        Gtk::Menu* pan_menu;
        Gtk::CheckMenuItem* bypass_menu_item;
        void build_pan_menu (uint32_t which);
@@ -163,6 +167,9 @@ class PannerUI : public Gtk::HBox
        std::string astyle_string (ARDOUR::AutoStyle);
        std::string short_astyle_string (ARDOUR::AutoStyle);
        std::string _astyle_string (ARDOUR::AutoStyle, bool);
+
+        void start_touch (boost::weak_ptr<ARDOUR::AutomationControl>);
+        void stop_touch (boost::weak_ptr<ARDOUR::AutomationControl>);
 };
 
 #endif /* __ardour_gtk_panner_ui_h__ */