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 d587359ecdf62ba74e80d70df88ed217290c9472..0e16d01a64601a8c8157c10d6fafd618d6343908 100644 (file)
--- a/gtk2_ardour/panner_ui.h
+++ b/gtk2_ardour/panner_ui.h
@@ -33,15 +33,21 @@
 #include <gtkmm2ext/click_box.h>
 #include <gtkmm2ext/slider_controller.h>
 
+#include "ardour/session_handle.h"
+
 #include "enums.h"
 
 class Panner2d;
 class PannerBar;
+class Panner2dWindow;
 
 namespace ARDOUR {
-       class IO;
        class Session;
+       class Panner;
+       class Delivery;
+        class AutomationControl;
 }
+
 namespace Gtkmm2ext {
        class FastMeter;
 }
@@ -51,13 +57,15 @@ namespace Gtk {
        class Menuitem;
 }
 
-class PannerUI : public Gtk::HBox
+class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 {
   public:
-       PannerUI (boost::shared_ptr<ARDOUR::IO>, ARDOUR::Session&);
+       PannerUI (ARDOUR::Session*);
        ~PannerUI ();
 
-       void pan_changed (void *);
+       virtual void set_panner (boost::shared_ptr<ARDOUR::Panner>);
+
+       void panner_changed (void *);
 
        void update_pan_sensitive ();
        void update_gain_sensitive ();
@@ -67,19 +75,27 @@ class PannerUI : public Gtk::HBox
 
        void effective_pan_display ();
 
-       void set_meter_strip_name (string name);
+       void set_meter_strip_name (std::string name);
+       boost::shared_ptr<PBD::Controllable> get_controllable();
+
+       void set_mono (bool);
 
   private:
        friend class MixerStrip;
-       boost::shared_ptr<ARDOUR::IO> _io;
-       ARDOUR::Session& _session;
+
+       boost::shared_ptr<ARDOUR::Panner> _panner;
+       PBD::ScopedConnectionList connections;
+       PBD::ScopedConnectionList _pan_control_connections;
 
        bool ignore_toggle;
        bool in_pan_update;
+       int _current_nouts;
+       int _current_npans;
 
        static const int pan_bar_height;
 
-       Panner2d*   panner;
+       Panner2d*       twod_panner; ///< 2D panner, or 0
+       Panner2dWindow* big_window;
 
        Gtk::VBox           pan_bar_packer;
        Gtk::Adjustment     hAdjustment;
@@ -99,26 +115,25 @@ class PannerUI : public Gtk::HBox
        bool panning_link_button_press (GdkEventButton*);
        bool panning_link_button_release (GdkEventButton*);
 
-       Gtk::Menu pan_astate_menu;
-       Gtk::Menu pan_astyle_menu;
+       Gtk::Menu* pan_astate_menu;
+       Gtk::Menu* pan_astyle_menu;
 
        Gtk::Button pan_automation_style_button;
        Gtk::ToggleButton pan_automation_state_button;
 
        void panning_link_direction_clicked ();
 
-       vector<Gtk::Adjustment*> pan_adjustments;
-       vector<PannerBar*> pan_bars;
+       std::vector<Gtk::Adjustment*> pan_adjustments;
+       std::vector<PannerBar*> pan_bars;
 
        void pan_adjustment_changed (uint32_t which);
        void pan_value_changed (uint32_t which);
-       void pan_printer (char* buf, uint32_t, Gtk::Adjustment*);
        void update_pan_bars (bool only_if_aplay);
        void update_pan_linkage ();
        void update_pan_state ();
+       void build_astate_menu ();
+       void build_astyle_menu ();
 
-       void panner_changed ();
-       
        void hide_pans ();
 
        void panner_moved (int which);
@@ -129,11 +144,14 @@ 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);
        void pan_mute (uint32_t which);
-       void pan_reset ();
+       void pan_reset (uint32_t);
+       void pan_reset_all ();
        void pan_bypass_toggle ();
 
        void pan_automation_state_changed();
@@ -149,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__ */