Move panner bypass state up to the PannerShell so that it is preserved even when...
[ardour.git] / gtk2_ardour / panner_ui.cc
index 8532c2094d1b4c6ef9d1183e62e2c8581fb4caee..71a982124226ffc778a63605dd7b8ddc5e3fc124 100644 (file)
@@ -21,7 +21,6 @@
 #include "ardour/io.h"
 #include "ardour/dB.h"
 #include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/barcontroller.h>
 #include "midi++/manager.h"
 #include "pbd/fastlog.h"
 #include "panner_ui.h"
 #include "panner2d.h"
 #include "utils.h"
-#include "panner.h"
 #include "gui_thread.h"
+#include "stereo_panner.h"
+#include "mono_panner.h"
 
 #include "ardour/delivery.h"
 #include "ardour/session.h"
 #include "ardour/panner.h"
+#include "ardour/pannable.h"
+#include "ardour/panner_shell.h"
 #include "ardour/route.h"
 
 #include "i18n.h"
@@ -46,17 +48,11 @@ using namespace PBD;
 using namespace Gtkmm2ext;
 using namespace Gtk;
 
-const int PannerUI::pan_bar_height = 30;
+const int PannerUI::pan_bar_height = 35;
 
 PannerUI::PannerUI (Session* s)
        : _current_nouts (-1)
-       , _current_npans (-1)
-       , hAdjustment(0.0, 0.0, 0.0)
-       , vAdjustment(0.0, 0.0, 0.0)
-       , panning_viewport(hAdjustment, vAdjustment)
-       , panning_up_arrow (Gtk::ARROW_UP, Gtk::SHADOW_OUT)
-       , panning_down_arrow (Gtk::ARROW_DOWN, Gtk::SHADOW_OUT)
-       , panning_link_button (_("link"))
+       , _current_nins (-1)
        , pan_automation_style_button ("")
        , pan_automation_state_button ("")
 {
@@ -67,6 +63,9 @@ PannerUI::PannerUI (Session* s)
        pan_astate_menu = 0;
        pan_astyle_menu = 0;
        in_pan_update = false;
+        _stereo_panner = 0;
+        _ignore_width_change = false;
+        _ignore_position_change = false;
 
        pan_automation_style_button.set_name ("MixerAutomationModeButton");
        pan_automation_state_button.set_name ("MixerAutomationPlaybackButton");
@@ -77,52 +76,13 @@ PannerUI::PannerUI (Session* s)
        //set_size_request_to_display_given_text (pan_automation_state_button, X_("O"), 2, 2);
        //set_size_request_to_display_given_text (pan_automation_style_button, X_("0"), 2, 2);
 
-       panning_viewport.set_name (X_("BaseFrame"));
-
-       ARDOUR_UI::instance()->set_tip (panning_link_button,
-                                                  _("panning link control"));
-       ARDOUR_UI::instance()->set_tip (panning_link_direction_button,
-                                                  _("panning link direction"));
-
        pan_automation_style_button.unset_flags (Gtk::CAN_FOCUS);
        pan_automation_state_button.unset_flags (Gtk::CAN_FOCUS);
 
        pan_automation_style_button.signal_button_press_event().connect (sigc::mem_fun(*this, &PannerUI::pan_automation_style_button_event), false);
        pan_automation_state_button.signal_button_press_event().connect (sigc::mem_fun(*this, &PannerUI::pan_automation_state_button_event), false);
 
-       panning_link_button.set_name (X_("PanningLinkButton"));
-       panning_link_direction_button.set_name (X_("PanningLinkDirectionButton"));
-
-       panning_link_box.pack_start (panning_link_button, true, true);
-       panning_link_box.pack_start (panning_link_direction_button, true, true);
-       panning_link_box.pack_start (pan_automation_state_button, true, true);
-
-       /* the pixmap will be reset at some point, but the key thing is that
-          we need a pixmap in the button just to get started.
-       */
-       panning_link_direction_button.add (*(manage (new Image (get_xpm("forwardblarrow.xpm")))));
-
-       panning_link_direction_button.signal_clicked().connect
-               (sigc::mem_fun(*this, &PannerUI::panning_link_direction_clicked));
-
-       panning_link_button.signal_button_press_event().connect
-               (sigc::mem_fun(*this, &PannerUI::panning_link_button_press), false);
-       panning_link_button.signal_button_release_event().connect
-               (sigc::mem_fun(*this, &PannerUI::panning_link_button_release), false);
-
-       panning_up.set_border_width (3);
-       panning_down.set_border_width (3);
-       panning_up.add (panning_up_arrow);
-       panning_down.add (panning_down_arrow);
-       panning_up.set_name (X_("PanScrollerBase"));
-       panning_down.set_name (X_("PanScrollerBase"));
-       panning_up_arrow.set_name (X_("PanScrollerArrow"));
-       panning_down_arrow.set_name (X_("PanScrollerArrow"));
-
        pan_vbox.set_spacing (2);
-       pan_vbox.pack_start (panning_viewport, Gtk::PACK_SHRINK);
-       pan_vbox.pack_start (panning_link_box, Gtk::PACK_SHRINK);
-
        pack_start (pan_vbox, true, true);
 
        twod_panner = 0;
@@ -132,8 +92,11 @@ PannerUI::PannerUI (Session* s)
 }
 
 void
-PannerUI::set_panner (boost::shared_ptr<Panner> p)
+PannerUI::set_panner (boost::shared_ptr<PannerShell> ps, boost::shared_ptr<Panner> p)
 {
+        /* note that the panshell might not change here (i.e. ps == _panshell)
+         */
+
        connections.drop_connections ();
 
        delete pan_astyle_menu;
@@ -142,45 +105,30 @@ PannerUI::set_panner (boost::shared_ptr<Panner> p)
        delete pan_astate_menu;
        pan_astate_menu = 0;
 
+        _panshell = ps;
        _panner = p;
 
        delete twod_panner;
        twod_panner = 0;
 
+        delete _stereo_panner;
+        _stereo_panner = 0;
+
        if (!_panner) {
                return;
        }
 
-       _panner->Changed.connect (connections, invalidator (*this), boost::bind (&PannerUI::panner_changed, this), gui_context());
-       _panner->LinkStateChanged.connect (connections, invalidator (*this), boost::bind (&PannerUI::update_pan_linkage, this), gui_context());
-       _panner->StateChanged.connect (connections, invalidator (*this), boost::bind (&PannerUI::update_pan_state, this), gui_context());
+       _panshell->Changed.connect (connections, invalidator (*this), boost::bind (&PannerUI::panshell_changed, this), gui_context());
 
-       for (uint32_t i = 0; i < _panner->npanners(); ++i) {
-               connect_to_pan_control (i);
-       }
+        /* new panner object, force complete reset of panner GUI
+         */
 
-       setup_pan ();
+        _current_nouts = 0;
+        _current_nins = 0;
 
-       pan_changed (0);
+        setup_pan ();
        update_pan_sensitive ();
-       update_pan_linkage ();
        pan_automation_state_changed ();
-
-#if WHERE_DOES_THIS_LIVE
-       pan_bar_packer.show();
-       panning_viewport.show();
-       panning_up.show();
-       panning_up_arrow.show();
-       panning_down.show();
-       panning_down_arrow.show();
-       pan_vbox.show();
-       panning_link_button.show();
-       panning_link_direction_button.show();
-       panning_link_box.show();
-       pan_automation_style_button.show();
-       pan_automation_state_button.show();
-       show();
-#endif
 }
 
 void
@@ -229,87 +177,25 @@ PannerUI::build_astyle_menu ()
 boost::shared_ptr<PBD::Controllable>
 PannerUI::get_controllable()
 {
+        assert (!pan_bars.empty());
        return pan_bars[0]->get_controllable();
 }
 
-bool
-PannerUI::panning_link_button_press (GdkEventButton*)
-{
-       return true;
-}
-
-bool
-PannerUI::panning_link_button_release (GdkEventButton*)
-{
-       if (!ignore_toggle) {
-               _panner->set_linked (!_panner->linked());
-       }
-       return true;
-}
-
 void
-PannerUI::panning_link_direction_clicked()
+PannerUI::on_size_allocate (Allocation& a)
 {
-       switch (_panner->link_direction()) {
-       case Panner::SameDirection:
-               _panner->set_link_direction (Panner::OppositeDirection);
-               break;
-       default:
-               _panner->set_link_direction (Panner::SameDirection);
-               break;
-       }
-}
-
-void
-PannerUI::update_pan_linkage ()
-{
-       ENSURE_GUI_THREAD (*this, &PannerUI::update_pan_linkage)
-
-       bool x = _panner->linked();
-       bool bx = panning_link_button.get_active();
-
-       if (x != bx) {
-
-               ignore_toggle = true;
-               panning_link_button.set_active (x);
-               ignore_toggle = false;
-       }
-
-       panning_link_direction_button.set_sensitive (x);
-
-       switch (_panner->link_direction()) {
-       case Panner::SameDirection:
-               panning_link_direction_button.set_image (*(manage (new Image (get_xpm ("forwardblarrow.xpm")))));
-               break;
-       default:
-               panning_link_direction_button.set_image (*(manage (new Image (get_xpm("revdblarrow.xpm")))));
-               break;
-       }
+        HBox::on_size_allocate (a);
 }
 
 void
 PannerUI::set_width (Width w)
 {
-       switch (w) {
-       case Wide:
-               panning_link_button.set_label (_("link"));
-               break;
-       case Narrow:
-               panning_link_button.set_label (_("L"));
-               break;
-       }
-
        _width = w;
 }
 
-
 PannerUI::~PannerUI ()
 {
-       for (vector<Adjustment*>::iterator i = pan_adjustments.begin(); i != pan_adjustments.end(); ++i) {
-               delete (*i);
-       }
-
-       for (vector<PannerBar*>::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) {
+       for (vector<MonoPanner*>::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) {
                delete (*i);
        }
 
@@ -318,22 +204,15 @@ PannerUI::~PannerUI ()
        delete pan_menu;
        delete pan_astyle_menu;
        delete pan_astate_menu;
+        delete _stereo_panner;
 }
 
 
 void
-PannerUI::panner_changed ()
+PannerUI::panshell_changed ()
 {
-       ENSURE_GUI_THREAD (*this, &PannerUI::panner_changed)
+        set_panner (_panshell, _panshell->panner());
        setup_pan ();
-       pan_changed (0);
-}
-
-void
-PannerUI::update_pan_state ()
-{
-       /* currently nothing to do */
-       // ENSURE_GUI_THREAD (*this, &PannerUI::update_panner_state)
 }
 
 void
@@ -343,146 +222,139 @@ PannerUI::setup_pan ()
                return;
        }
 
-       uint32_t const nouts = _panner->nouts();
-       uint32_t const npans = _panner->npanners();
+       uint32_t const nouts = _panner->out().n_audio();
+       uint32_t const nins = _panner->in().n_audio();
 
-       if (int32_t (nouts) == _current_nouts && int32_t (npans) == _current_npans) {
+       if (int32_t (nouts) == _current_nouts && int32_t (nins) == _current_nins) {
                return;
        }
 
-       _current_nouts = nouts;
-       _current_npans = npans;
+        _current_nins = nins;
+        _current_nouts = nouts;
 
-       if (nouts == 0 || nouts == 1) {
+        container_clear (pan_vbox);
 
-               while (!pan_adjustments.empty()) {
-                       delete pan_bars.back();
-                       pan_bars.pop_back ();
-                       delete pan_adjustments.back();
-                       pan_adjustments.pop_back ();
-               }
+        delete twod_panner;
+        twod_panner = 0;
+        delete _stereo_panner;
+        _stereo_panner = 0;
 
-               delete twod_panner;
-               twod_panner = 0;
+       if (nouts == 0 || nouts == 1) {
+
+                delete _stereo_panner;
+                delete twod_panner;
 
                /* stick something into the panning viewport so that it redraws */
 
                EventBox* eb = manage (new EventBox());
-               panning_viewport.remove ();
-               panning_viewport.add (*eb);
-               panning_viewport.show_all ();
+               pan_vbox.pack_start (*eb, false, false);
 
        } else if (nouts == 2) {
 
-               vector<Adjustment*>::size_type asz;
-
-               while (!pan_adjustments.empty()) {
-                       delete pan_bars.back();
-                       pan_bars.pop_back ();
-                       delete pan_adjustments.back();
-                       pan_adjustments.pop_back ();
-               }
+                if (nins == 2) {
 
-               delete twod_panner;
-               twod_panner = 0;
+                        /* add integrated 2in/2out panner GUI */
 
-               while ((asz = pan_adjustments.size()) < npans) {
+                        boost::shared_ptr<Pannable> pannable = _panner->pannable();
 
-                       float x, rx;
-                       PannerBar* bc;
+                        _stereo_panner = new StereoPanner (_panner);
+                        _stereo_panner->set_size_request (-1, pan_bar_height);
+                        pan_vbox.pack_start (*_stereo_panner, false, false);
 
-                       /* initialize adjustment with 0.0 (L) or 1.0 (R) for the first and second panners,
-                          which serves as a default, otherwise use current value */
+                        boost::shared_ptr<AutomationControl> ac;
 
-                       rx = _panner->pan_control( asz)->get_value();
+                        ac = pannable->pan_azimuth_control;
+                        _stereo_panner->StartPositionGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::start_touch),
+                                                                                  boost::weak_ptr<AutomationControl> (ac)));
+                        _stereo_panner->StopPositionGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::stop_touch),
+                                                                                 boost::weak_ptr<AutomationControl>(ac)));
 
-                       if (npans == 1) {
-                               x = 0.5;
-                       } else if (asz == 0) {
-                               x = 0.0;
-                       } else if (asz == 1) {
-                               x = 1.0;
-                       } else {
-                               x = rx;
-                       }
+                        ac = pannable->pan_width_control;
+                        _stereo_panner->StartWidthGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::start_touch),
+                                                                               boost::weak_ptr<AutomationControl> (ac)));
+                        _stereo_panner->StopWidthGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::stop_touch),
+                                                                              boost::weak_ptr<AutomationControl>(ac)));
+                        _stereo_panner->signal_button_release_event().connect (sigc::mem_fun(*this, &PannerUI::pan_button_event));
 
-                       pan_adjustments.push_back (new Adjustment (x, 0, 1.0, 0.005, 0.05));
-                       bc = new PannerBar (*pan_adjustments[asz],
-                               boost::static_pointer_cast<PBD::Controllable>( _panner->pan_control( asz )) );
+                } else if (nins == 1) {
+                        /* 1-in/2out */
 
-                       /* now set adjustment with current value of panner, then connect the signals */
-                       pan_adjustments.back()->set_value(rx);
-                       pan_adjustments.back()->signal_value_changed().connect (sigc::bind (sigc::mem_fun(*this, &PannerUI::pan_adjustment_changed), (uint32_t) asz));
-                       connect_to_pan_control (asz);
+                        MonoPanner* mp;
+                        boost::shared_ptr<Pannable> pannable = _panner->pannable();
+                        boost::shared_ptr<AutomationControl> ac = pannable->pan_azimuth_control;
 
-                       bc->set_name ("PanSlider");
-                       bc->set_shadow_type (Gtk::SHADOW_NONE);
+                        mp = new MonoPanner (ac);
 
-                       boost::shared_ptr<AutomationControl> ac = _panner->pan_control (asz);
+                        mp->StartGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::start_touch),
+                                                                      boost::weak_ptr<AutomationControl> (ac)));
+                        mp->StopGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::stop_touch),
+                                                             boost::weak_ptr<AutomationControl>(ac)));
 
-                       if (asz) {
-                               bc->StartGesture.connect (sigc::mem_fun (*ac, &AutomationControl::start_touch));
-                               bc->StopGesture.connect (sigc::mem_fun (*ac, &AutomationControl::stop_touch));
-                       }
+                        mp->signal_button_release_event().connect (sigc::mem_fun(*this, &PannerUI::pan_button_event));
 
-                       char buf[64];
-                       snprintf (buf, sizeof (buf), _("panner for channel %zu"), asz + 1);
-                       ARDOUR_UI::instance()->set_tip (bc->event_widget(), buf);
+                        mp->set_size_request (-1, pan_bar_height);
 
-                       bc->event_widget().signal_button_release_event().connect
-                               (sigc::bind (sigc::mem_fun(*this, &PannerUI::pan_button_event), (uint32_t) asz));
+                        update_pan_sensitive ();
+                        pan_vbox.pack_start (*mp, false, false);
 
-                       bc->set_size_request (-1, pan_bar_height);
+                } else {
+                        warning << string_compose (_("No panner user interface is currently available for %1-in/2out tracks/busses"),
+                                                   nins) << endmsg;
+                }
 
-                       pan_bars.push_back (bc);
-                       pan_bar_packer.pack_start (*bc, false, false);
-               }
-
-               /* now that we actually have the pan bars,
-                  set their sensitivity based on current
-                  automation state.
-               */
-
-               update_pan_sensitive ();
-
-               panning_viewport.remove ();
-               panning_viewport.add (pan_bar_packer);
-               panning_viewport.show_all ();
 
        } else {
 
                if (!twod_panner) {
-                       twod_panner = new Panner2d (_panner, 61);
+                       twod_panner = new Panner2d (_panshell, 61);
                        twod_panner->set_name ("MixerPanZone");
                        twod_panner->show ();
-
-                       twod_panner->signal_button_press_event().connect
-                               (sigc::bind (sigc::mem_fun(*this, &PannerUI::pan_button_event), (uint32_t) 0), false);
+                       twod_panner->signal_button_press_event().connect (sigc::mem_fun(*this, &PannerUI::pan_button_event), false);
                }
 
                update_pan_sensitive ();
-               twod_panner->reset (npans);
+               twod_panner->reset (nins);
                if (big_window) {
-                       big_window->reset (npans);
+                       big_window->reset (nins);
                }
                twod_panner->set_size_request (-1, 61);
 
                /* and finally, add it to the panner frame */
 
-               panning_viewport.remove ();
-               panning_viewport.add (*twod_panner);
-               panning_viewport.show_all ();
+                pan_vbox.pack_start (*twod_panner, false, false);
        }
+
+        pan_vbox.show_all ();
+}
+
+void
+PannerUI::start_touch (boost::weak_ptr<AutomationControl> wac)
+{
+        boost::shared_ptr<AutomationControl> ac = wac.lock();
+        if (!ac) {
+                return;
+        }
+        ac->start_touch (ac->session().transport_frame());
+}
+
+void
+PannerUI::stop_touch (boost::weak_ptr<AutomationControl> wac)
+{
+        boost::shared_ptr<AutomationControl> ac = wac.lock();
+        if (!ac) {
+                return;
+        }
+        ac->stop_touch (false, ac->session().transport_frame());
 }
 
 bool
-PannerUI::pan_button_event (GdkEventButton* ev, uint32_t which)
+PannerUI::pan_button_event (GdkEventButton* ev)
 {
        switch (ev->button) {
        case 1:
                if (twod_panner && ev->type == GDK_2BUTTON_PRESS) {
                        if (!big_window) {
-                               big_window = new Panner2dWindow (_panner, 400, _panner->npanners());
+                               big_window = new Panner2dWindow (_panshell, 400, _panner->in().n_audio());
                        }
                        big_window->show ();
                        return true;
@@ -494,7 +366,7 @@ PannerUI::pan_button_event (GdkEventButton* ev, uint32_t which)
                        pan_menu = manage (new Menu);
                        pan_menu->set_name ("ArdourContextMenu");
                }
-               build_pan_menu (which);
+               build_pan_menu ();
                pan_menu->popup (1, ev->time);
                return true;
                break;
@@ -506,233 +378,62 @@ PannerUI::pan_button_event (GdkEventButton* ev, uint32_t which)
 }
 
 void
-PannerUI::build_pan_menu (uint32_t which)
+PannerUI::build_pan_menu ()
 {
        using namespace Menu_Helpers;
        MenuList& items (pan_menu->items());
 
        items.clear ();
 
-       items.push_back (CheckMenuElem (_("Mute")));
-
-       /* set state first, connect second */
-
-       (dynamic_cast<CheckMenuItem*> (&items.back()))->set_active (_panner->streampanner(which).muted());
-       (dynamic_cast<CheckMenuItem*> (&items.back()))->signal_toggled().connect
-               (sigc::bind (sigc::mem_fun(*this, &PannerUI::pan_mute), which));
-
        items.push_back (CheckMenuElem (_("Bypass"), sigc::mem_fun(*this, &PannerUI::pan_bypass_toggle)));
        bypass_menu_item = static_cast<CheckMenuItem*> (&items.back());
 
        /* set state first, connect second */
 
-       bypass_menu_item->set_active (_panner->bypassed());
+       bypass_menu_item->set_active (_panshell->bypassed());
        bypass_menu_item->signal_toggled().connect (sigc::mem_fun(*this, &PannerUI::pan_bypass_toggle));
 
-       items.push_back (MenuElem (_("Reset"), sigc::bind (sigc::mem_fun (*this, &PannerUI::pan_reset), which)));
-       items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Reset all"), sigc::mem_fun (*this, &PannerUI::pan_reset_all)));
-}
-
-void
-PannerUI::pan_mute (uint32_t which)
-{
-       StreamPanner& sp = _panner->streampanner(which);
-       sp.set_muted (!sp.muted());
+       items.push_back (MenuElem (_("Reset"), sigc::mem_fun (*this, &PannerUI::pan_reset)));
 }
 
 void
 PannerUI::pan_bypass_toggle ()
 {
-       if (bypass_menu_item && (_panner->bypassed() != bypass_menu_item->get_active())) {
-               _panner->set_bypassed (!_panner->bypassed());
+       if (bypass_menu_item && (_panshell->bypassed() != bypass_menu_item->get_active())) {
+               _panshell->set_bypassed (!_panshell->bypassed());
        }
 }
 
 void
-PannerUI::pan_reset (uint32_t which)
+PannerUI::pan_reset ()
 {
-       _panner->reset_streampanner (which);
-}
-
-void
-PannerUI::pan_reset_all ()
-{
-       _panner->reset_to_default ();
+       _panner->reset ();
 }
 
 void
 PannerUI::effective_pan_display ()
 {
-       if (_panner->empty()) {
-               return;
+        if (_stereo_panner) {
+                _stereo_panner->queue_draw ();
+        } else if (twod_panner) {
+                twod_panner->queue_draw ();
+        } else {
+                for (vector<MonoPanner*>::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) {
+                        (*i)->queue_draw ();
+                }
        }
-
-       switch (_panner->nouts()) {
-       case 0:
-       case 1:
-               /* relax */
-               break;
-
-       case 2:
-               update_pan_bars (true);
-               break;
-
-       default:
-               //panner->move_puck (pan_value (v, right), 0.5);
-               break;
-       }
-}
-
-void
-PannerUI::pan_changed (void *src)
-{
-       if (src == this) {
-               return;
-       }
-
-       switch (_panner->npanners()) {
-       case 0:
-               panning_link_direction_button.set_sensitive (false);
-               panning_link_button.set_sensitive (false);
-               return;
-       case 1:
-               panning_link_direction_button.set_sensitive (false);
-               panning_link_button.set_sensitive (false);
-               break;
-       default:
-               panning_link_direction_button.set_sensitive (true);
-               panning_link_button.set_sensitive (true);
-       }
-
-       uint32_t nouts = _panner->nouts();
-
-       switch (nouts) {
-       case 0:
-       case 1:
-               /* relax */
-               break;
-
-       case 2:
-               /* bring pan bar state up to date */
-               update_pan_bars (false);
-               break;
-
-       default:
-               // panner->move_puck (pan_value (pans[0], pans[1]), 0.5);
-               break;
-       }
-}
-
-void
-PannerUI::pan_adjustment_changed (uint32_t which)
-{
-       if (!in_pan_update && which < _panner->npanners()) {
-
-               float val = pan_adjustments[which]->get_value ();
-               float const xpos = _panner->pan_control(which)->get_value();
-
-               /* add a kinda-sorta detent for the middle */
-
-               if (val != 0.5 && Panner::equivalent (val, 0.5)) {
-                       /* this is going to be reentrant, so just
-                          return after it.
-                       */
-
-                       in_pan_update = true;
-                       pan_adjustments[which]->set_value (0.5);
-                       in_pan_update = false;
-                       return;
-               }
-
-               if (!Panner::equivalent (val, xpos)) {
-
-                       _panner->pan_control(which)->set_value (val);
-                       /* XXX
-                          the panner objects have no access to the session,
-                          so do this here. ick.
-                       */
-                       _session->set_dirty();
-               }
-       }
-}
-
-void
-PannerUI::pan_value_changed (uint32_t which)
-{
-       ENSURE_GUI_THREAD (*this, &PannerUI::pan_value_changed, which)
-
-       if (_panner->npanners() > 0 && which < _panner->npanners()) {
-               float xpos;
-               float val = pan_adjustments[which]->get_value ();
-
-               _panner->streampanner(which).get_position (xpos);
-
-               if (!Panner::equivalent (val, xpos)) {
-                       in_pan_update = true;
-                       pan_adjustments[which]->set_value (xpos);
-                       in_pan_update = false;
-               }
-       }
-}
-
-void
-PannerUI::update_pan_bars (bool only_if_aplay)
-{
-       uint32_t n;
-       vector<Adjustment*>::iterator i;
-
-       in_pan_update = true;
-
-       /* this runs during automation playback, and moves the bar controllers
-          and/or pucks around.
-       */
-
-       for (i = pan_adjustments.begin(), n = 0; i != pan_adjustments.end(); ++i, ++n) {
-               float xpos, val;
-
-               if (only_if_aplay) {
-                       boost::shared_ptr<AutomationList> alist (_panner->streampanner(n).pan_control()->alist());
-
-                       if (!alist->automation_playback()) {
-                               continue;
-                       }
-               }
-
-               _panner->streampanner(n).get_effective_position (xpos);
-               val = (*i)->get_value ();
-
-               if (!Panner::equivalent (val, xpos)) {
-                       (*i)->set_value (xpos);
-               }
-       }
-
-       in_pan_update = false;
 }
 
 void
 PannerUI::update_pan_sensitive ()
 {
-       bool const sensitive = !(_panner->mono()) && !(_panner->automation_state() & Play);
+       bool const sensitive = !(_panner->pannable()->automation_state() & Play);
 
-       switch (_panner->nouts()) {
-       case 0:
-       case 1:
-               break;
-       case 2:
-               for (vector<PannerBar*>::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) {
-                       (*i)->set_sensitive (sensitive);
-               }
-               break;
-       default:
-               if (twod_panner) {
-                       twod_panner->set_sensitive (sensitive);
-               }
-               if (big_window) {
-                       big_window->set_sensitive (sensitive);
-               }
-               break;
-       }
+        pan_vbox.set_sensitive (sensitive);
+
+        if (big_window) {
+                big_window->set_sensitive (sensitive);
+        }
 }
 
 gint
@@ -796,32 +497,21 @@ PannerUI::pan_automation_style_changed ()
 void
 PannerUI::pan_automation_state_changed ()
 {
-       ENSURE_GUI_THREAD (*this, &PannerUI::pan_automation_state_changed)
-
-       bool x;
+        boost::shared_ptr<Pannable> pannable (_panner->pannable());
 
        switch (_width) {
        case Wide:
-         pan_automation_state_button.set_label (astate_string(_panner->automation_state()));
+                pan_automation_state_button.set_label (astate_string(pannable->automation_state()));
                break;
        case Narrow:
-         pan_automation_state_button.set_label (short_astate_string(_panner->automation_state()));
+                pan_automation_state_button.set_label (short_astate_string(pannable->automation_state()));
                break;
        }
 
-       /* when creating a new session, we get to create busses (and
-          sometimes tracks) with no outputs by the time they get
-          here.
-       */
-
-       if (_panner->empty()) {
-               return;
-       }
-
-       x = (_panner->streampanner(0).pan_control()->alist()->automation_state() != Off);
+       bool x = (pannable->automation_state() != Off);
 
        if (pan_automation_state_button.get_active() != x) {
-       ignore_toggle = true;
+                ignore_toggle = true;
                pan_automation_state_button.set_active (x);
                ignore_toggle = false;
        }
@@ -897,15 +587,21 @@ PannerUI::_astyle_string (AutoStyle style, bool shrt)
 }
 
 void
-PannerUI::set_mono (bool yn)
+PannerUI::show_width ()
 {
-       _panner->set_mono (yn);
-       update_pan_sensitive ();
 }
 
+void
+PannerUI::width_adjusted ()
+{
+}
+
+void
+PannerUI::show_position ()
+{
+}
 
 void
-PannerUI::connect_to_pan_control (uint32_t i)
+PannerUI::position_adjusted ()
 {
-       _panner->pan_control(i)->Changed.connect (connections, invalidator (*this), boost::bind (&PannerUI::pan_value_changed, this, i), gui_context ());
 }