Add a missing #define to our MSVC project (portaudio_backend)
[ardour.git] / gtk2_ardour / panner_ui.cc
index ca10dd430055f7fa13bb0a278a3057b8bbdd3cc7..08188337674612562c65c1ea27454e4d1907b87a 100644 (file)
 
 #include <limits.h>
 
-#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 "ardour_ui.h"
+#include "ardour/pannable.h"
+#include "ardour/panner.h"
+#include "ardour/panner_shell.h"
+#include "ardour/session.h"
+
 #include "panner_ui.h"
 #include "panner2d.h"
-#include "utils.h"
-#include "panner.h"
 #include "gui_thread.h"
+#include "stereo_panner.h"
+#include "timers.h"
+#include "tooltips.h"
+#include "mono_panner.h"
+#include "ui_config.h"
 
-#include "ardour/delivery.h"
-#include "ardour/session.h"
-#include "ardour/panner.h"
-#include "ardour/route.h"
-
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtkmm2ext;
 using namespace Gtk;
-using namespace sigc;
-
-const int PannerUI::pan_bar_height = 30;
-
-PannerUI::PannerUI (Session& s)
-       : _session (s),
-         _current_nouts (-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")),
-         pan_automation_style_button (""),
-         pan_automation_state_button ("")
+using namespace ARDOUR_UI_UTILS;
+
+PannerUI::PannerUI (Session* s)
+       : _current_nouts (-1)
+       , _current_nins (-1)
+       , _current_uri ("")
+       , _send_mode (false)
+       , pan_automation_style_button ("")
+       , pan_automation_state_button ("")
+       , _panner_list()
 {
+       set_session (s);
+
        ignore_toggle = false;
        pan_menu = 0;
        pan_astate_menu = 0;
        pan_astyle_menu = 0;
        in_pan_update = false;
+        _stereo_panner = 0;
+       _mono_panner = 0;
+        _ignore_width_change = false;
+        _ignore_position_change = false;
 
        pan_automation_style_button.set_name ("MixerAutomationModeButton");
        pan_automation_state_button.set_name ("MixerAutomationPlaybackButton");
 
-       ARDOUR_UI::instance()->tooltips().set_tip (pan_automation_state_button, _("Pan automation mode"));
-       ARDOUR_UI::instance()->tooltips().set_tip (pan_automation_style_button, _("Pan automation type"));
+       set_tooltip (pan_automation_state_button, _("Pan automation mode"));
+       set_tooltip (pan_automation_style_button, _("Pan automation type"));
 
        //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);
 
-       pan_bar_packer.set_size_request (-1, 61);
-       panning_viewport.set_size_request (-1, 61);
-       panning_viewport.set_name (X_("BaseFrame"));
-
-       ARDOUR_UI::instance()->tooltips().set_tip (panning_link_button,
-                                                  _("panning link control"));
-       ARDOUR_UI::instance()->tooltips().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 (mem_fun(*this, &PannerUI::pan_automation_style_button_event), false);
-       pan_automation_state_button.signal_button_press_event().connect (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
-               (mem_fun(*this, &PannerUI::panning_link_direction_clicked));
-
-       panning_link_button.signal_button_press_event().connect
-               (mem_fun(*this, &PannerUI::panning_link_button_press), false);
-       panning_link_button.signal_button_release_event().connect
-               (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_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);
 
        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);
 
-       panner = 0;
+       twod_panner = 0;
        big_window = 0;
 
        set_width(Narrow);
 }
 
 void
-PannerUI::set_panner (boost::shared_ptr<Panner> p)
+PannerUI::set_panner (boost::shared_ptr<PannerShell> ps, boost::shared_ptr<Panner> p)
 {
-       connections.clear ();
+        /* note that the panshell might not change here (i.e. ps == _panshell)
+         */
+
+       connections.drop_connections ();
 
        delete pan_astyle_menu;
        pan_astyle_menu = 0;
@@ -143,41 +104,33 @@ PannerUI::set_panner (boost::shared_ptr<Panner> p)
        delete pan_astate_menu;
        pan_astate_menu = 0;
 
+        _panshell = ps;
        _panner = p;
 
-       delete panner;
-       panner = 0;
+       delete twod_panner;
+       twod_panner = 0;
+
+        delete _stereo_panner;
+        _stereo_panner = 0;
+
+        delete _mono_panner;
+        _mono_panner = 0;
 
        if (!_panner) {
                return;
        }
 
-       connections.push_back (_panner->Changed.connect (mem_fun(*this, &PannerUI::panner_changed)));
-       connections.push_back (_panner->LinkStateChanged.connect (mem_fun(*this, &PannerUI::update_pan_linkage)));
-       connections.push_back (_panner->StateChanged.connect (mem_fun(*this, &PannerUI::update_pan_state)));
+       _panshell->Changed.connect (connections, invalidator (*this), boost::bind (&PannerUI::panshell_changed, this), gui_context());
 
-       setup_pan ();
+        /* new panner object, force complete reset of panner GUI
+         */
 
-       pan_changed (0);
+        _current_nouts = 0;
+        _current_nins = 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
@@ -192,17 +145,20 @@ PannerUI::build_astate_menu ()
                pan_astate_menu->items().clear ();
        }
 
-       pan_astate_menu->items().push_back (MenuElem (_("Manual"), bind (
-                       mem_fun (_panner.get(), &Panner::set_automation_state),
-                       (AutoState) Off)));
-       pan_astate_menu->items().push_back (MenuElem (_("Play"), bind (
-                       mem_fun (_panner.get(), &Panner::set_automation_state),
+       /** TRANSLATORS: this is `Manual' in the sense of automation not being played,
+           so that changes to pan must be done by hand.
+       */
+       pan_astate_menu->items().push_back (MenuElem (S_("Automation|Manual"), sigc::bind (
+                       sigc::mem_fun (_panner.get(), &Panner::set_automation_state),
+                       (AutoState) ARDOUR::Off)));
+       pan_astate_menu->items().push_back (MenuElem (_("Play"), sigc::bind (
+                       sigc::mem_fun (_panner.get(), &Panner::set_automation_state),
                        (AutoState) Play)));
-       pan_astate_menu->items().push_back (MenuElem (_("Write"), bind (
-                       mem_fun (_panner.get(), &Panner::set_automation_state),
+       pan_astate_menu->items().push_back (MenuElem (_("Write"), sigc::bind (
+                       sigc::mem_fun (_panner.get(), &Panner::set_automation_state),
                        (AutoState) Write)));
-       pan_astate_menu->items().push_back (MenuElem (_("Touch"), bind (
-                       mem_fun (_panner.get(), &Panner::set_automation_state),
+       pan_astate_menu->items().push_back (MenuElem (_("Touch"), sigc::bind (
+                       sigc::mem_fun (_panner.get(), &Panner::set_automation_state),
                        (AutoState) Touch)));
 
 }
@@ -223,260 +179,196 @@ PannerUI::build_astyle_menu ()
        pan_astyle_menu->items().push_back (MenuElem (_("Abs")));
 }
 
-boost::shared_ptr<PBD::Controllable>
-PannerUI::get_controllable()
-{
-       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(mem_fun(*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) {
-               delete (*i);
-       }
-
-       delete panner;
+       delete twod_panner;
        delete big_window;
        delete pan_menu;
        delete pan_astyle_menu;
        delete pan_astate_menu;
+        delete _stereo_panner;
+        delete _mono_panner;
 }
 
-
 void
-PannerUI::panner_changed ()
+PannerUI::panshell_changed ()
 {
-       ENSURE_GUI_THREAD (mem_fun(*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 (mem_fun(*this, &PannerUI::update_panner_state));
 }
 
 void
 PannerUI::setup_pan ()
 {
-       if (!_panner) {
-               return;
-       }
+       int const nouts = _panner ? _panner->out().n_audio() : -1;
+       int const nins = _panner ? _panner->in().n_audio() : -1;
 
-       uint32_t nouts = _panner->nouts();
-
-       if (int32_t (nouts) == _current_nouts) {
+       if (nouts == _current_nouts
+                       && nins == _current_nins
+                       && _current_uri == _panshell->panner_gui_uri()
+                       )
+       {
                return;
        }
 
-       _current_nouts = nouts;
-
-       cout << "Setup pan for " << _panner->name() << endl;
-
-       if (nouts == 0 || nouts == 1) {
-
-               while (!pan_adjustments.empty()) {
-                       delete pan_bars.back();
-                       pan_bars.pop_back ();
-                       delete pan_adjustments.back();
-                       pan_adjustments.pop_back ();
-               }
-
-               /* 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 ();
-
-       } else if (nouts == 2) {
-
-               vector<Adjustment*>::size_type asz;
-               uint32_t npans = _panner->npanners();
-
-               while (!pan_adjustments.empty()) {
-                       delete pan_bars.back();
-                       pan_bars.pop_back ();
-                       delete pan_adjustments.back();
-                       pan_adjustments.pop_back ();
-               }
-
-               while ((asz = pan_adjustments.size()) < npans) {
+        _current_nins = nins;
+        _current_nouts = nouts;
+        _current_uri = _panshell->panner_gui_uri();
 
-                       float x, rx;
-                       PannerBar* bc;
+        container_clear (pan_vbox);
 
-                       /* 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 */
+        delete twod_panner;
+        twod_panner = 0;
+        delete _stereo_panner;
+        _stereo_panner = 0;
+       delete _mono_panner;
+       _mono_panner = 0;
 
-                       rx = _panner->pan_control( asz)->get_value();
+       if (!_panner) {
+               delete big_window;
+               big_window = 0;
+               return;
+       }
 
-                       if (npans == 1) {
-                               x = 0.5;
-                       } else if (asz == 0) {
-                               x = 0.0;
-                       } else if (asz == 1) {
-                               x = 1.0;
-                       } else {
-                               x = rx;
-                       }
+       const float scale = std::max (1.f, UIConfiguration::instance().get_ui_scale());
 
-                       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 )) );
+       if (_current_uri == "http://ardour.org/plugin/panner_2in2out#ui")
+       {
+               delete big_window;
+               big_window = 0;
 
-                       /* 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 (bind (mem_fun(*this, &PannerUI::pan_adjustment_changed), (uint32_t) asz));
+               boost::shared_ptr<Pannable> pannable = _panner->pannable();
 
-                       _panner->pan_control( asz )->Changed.connect (bind (mem_fun(*this, &PannerUI::pan_value_changed), (uint32_t) asz));
+               _stereo_panner = new StereoPanner (_panshell);
+               _stereo_panner->set_size_request (-1, 5 * ceilf(7.f * scale));
+               _stereo_panner->set_send_drawing_mode (_send_mode);
+               pan_vbox.pack_start (*_stereo_panner, false, false);
 
+               boost::shared_ptr<AutomationControl> ac;
 
-                       bc->set_name ("PanSlider");
-                       bc->set_shadow_type (Gtk::SHADOW_NONE);
+               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)));
 
-                       boost::shared_ptr<AutomationControl> ac = _panner->pan_control (asz);
+               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));
+       }
+       else if (_current_uri == "http://ardour.org/plugin/panner_1in2out#ui"
+                       || _current_uri == "http://ardour.org/plugin/panner_balance#ui")
+       {
+               delete big_window;
+               big_window = 0;
+               boost::shared_ptr<Pannable> pannable = _panner->pannable();
+               boost::shared_ptr<AutomationControl> ac = pannable->pan_azimuth_control;
 
-                       if (asz) {
-                               bc->StartGesture.connect (mem_fun (*ac, &AutomationControl::start_touch));
-                               bc->StopGesture.connect (mem_fun (*ac, &AutomationControl::stop_touch));
-                       }
+               _mono_panner = new MonoPanner (_panshell);
 
-                       char buf[64];
-                       snprintf (buf, sizeof (buf), _("panner for channel %zu"), asz + 1);
-                       ARDOUR_UI::instance()->tooltips().set_tip (bc->event_widget(), buf);
+               _mono_panner->StartGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::start_touch),
+                                       boost::weak_ptr<AutomationControl> (ac)));
+               _mono_panner->StopGesture.connect (sigc::bind (sigc::mem_fun (*this, &PannerUI::stop_touch),
+                                       boost::weak_ptr<AutomationControl>(ac)));
 
-                       bc->event_widget().signal_button_release_event().connect
-                               (bind (mem_fun(*this, &PannerUI::pan_button_event), (uint32_t) asz));
+               _mono_panner->signal_button_release_event().connect (sigc::mem_fun(*this, &PannerUI::pan_button_event));
 
-                       bc->set_size_request (-1, pan_bar_height);
+               _mono_panner->set_size_request (-1, 5 * ceilf(7.f * scale));
+               _mono_panner->set_send_drawing_mode (_send_mode);
 
-                       pan_bars.push_back (bc);
-                       pan_bar_packer.pack_start (*bc, false, false);
+               update_pan_sensitive ();
+               pan_vbox.pack_start (*_mono_panner, false, false);
+       }
+       else if (_current_uri == "http://ardour.org/plugin/panner_vbap#ui")
+       {
+               if (!twod_panner) {
+                       twod_panner = new Panner2d (_panshell, rintf(61.f * scale));
+                       twod_panner->set_name ("MixerPanZone");
+                       twod_panner->show ();
+                       twod_panner->signal_button_press_event().connect (sigc::mem_fun(*this, &PannerUI::pan_button_event), false);
                }
 
-               /* now that we actually have the pan bars,
-                  set their sensitivity based on current
-                  automation state.
-               */
-
                update_pan_sensitive ();
+               twod_panner->reset (nins);
+               if (big_window) {
+                       big_window->reset (nins);
+               }
+               twod_panner->set_size_request (-1, rintf(61.f * scale));
+               twod_panner->set_send_drawing_mode (_send_mode);
 
-               panning_viewport.remove ();
-               panning_viewport.add (pan_bar_packer);
-               panning_viewport.show_all ();
+               /* and finally, add it to the panner frame */
 
-       } else {
+               pan_vbox.pack_start (*twod_panner, false, false);
+       }
+       else
+       {
+               /* stick something into the panning viewport so that it redraws */
+               EventBox* eb = manage (new EventBox());
+               pan_vbox.pack_start (*eb, false, false);
 
-               if (!panner) {
-                       panner = new Panner2d (_panner, 61);
-                       panner->set_name ("MixerPanZone");
-                       panner->show ();
+               delete big_window;
+               big_window = 0;
+       }
 
-                       panner->signal_button_press_event().connect
-                               (bind (mem_fun(*this, &PannerUI::pan_button_event), (uint32_t) 0), false);
-               }
+       pan_vbox.show_all ();
+}
 
-               update_pan_sensitive ();
-               panner->reset (nouts);
-               if (big_window) {
-                       big_window->reset (_panner->npanners());
-               }
-               panner->set_size_request (-1, 61);
+void
+PannerUI::set_send_drawing_mode (bool onoff)
+{
+       if (_stereo_panner) {
+               _stereo_panner->set_send_drawing_mode (onoff);
+       } else if (_mono_panner) {
+               _mono_panner->set_send_drawing_mode (onoff);
+       } else if (twod_panner) {
+               twod_panner->set_send_drawing_mode (onoff);
+       }
+       _send_mode = onoff;
+}
 
-               /* and finally, add it to the panner frame */
+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());
+}
 
-               panning_viewport.remove ();
-               panning_viewport.add (*panner);
-               panning_viewport.show_all ();
-       }
+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 (panner && ev->type == GDK_2BUTTON_PRESS) {
+               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;
@@ -488,7 +380,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;
@@ -500,234 +392,104 @@ 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")));
+       items.push_back (CheckMenuElem (_("Bypass"), sigc::mem_fun(*this, &PannerUI::pan_bypass_toggle)));
+       bypass_menu_item = static_cast<Gtk::CheckMenuItem*> (&items.back());
 
        /* set state first, connect second */
 
-       (dynamic_cast<CheckMenuItem*> (&items.back()))->set_active (_panner->streampanner(which).muted());
-       (dynamic_cast<CheckMenuItem*> (&items.back()))->signal_toggled().connect
-               (bind (mem_fun(*this, &PannerUI::pan_mute), which));
-
-       items.push_back (CheckMenuElem (_("Bypass"), mem_fun(*this, &PannerUI::pan_bypass_toggle)));
-       bypass_menu_item = static_cast<CheckMenuItem*> (&items.back());
+       bypass_menu_item->set_active (_panshell->bypassed());
+       bypass_menu_item->signal_toggled().connect (sigc::mem_fun(*this, &PannerUI::pan_bypass_toggle));
 
-       /* set state first, connect second */
-
-       bypass_menu_item->set_active (_panner->bypassed());
-       bypass_menu_item->signal_toggled().connect (mem_fun(*this, &PannerUI::pan_bypass_toggle));
+       if (!_panshell->bypassed()) {
+               items.push_back (MenuElem (_("Reset"), sigc::mem_fun (*this, &PannerUI::pan_reset)));
+               items.push_back (MenuElem (_("Edit..."), sigc::mem_fun (*this, &PannerUI::pan_edit)));
+       }
 
-       items.push_back (MenuElem (_("Reset"), bind (mem_fun (*this, &PannerUI::pan_reset), which)));
-       items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Reset all"), mem_fun (*this, &PannerUI::pan_reset_all)));
-}
+       if (_panner_list.size() > 1 && !_panshell->bypassed()) {
+               RadioMenuItem::Group group;
+               items.push_back (SeparatorElem());
 
-void
-PannerUI::pan_mute (uint32_t which)
-{
-       StreamPanner& sp = _panner->streampanner(which);
-       sp.set_muted (!sp.muted());
+               _suspend_menu_callbacks = true;
+               for (std::map<std::string,std::string>::const_iterator p = _panner_list.begin(); p != _panner_list.end(); ++p) {
+                       items.push_back (RadioMenuElem (group, p->second,
+                                               sigc::bind(sigc::mem_fun (*this, &PannerUI::pan_set_custom_type), p->first)));
+                       RadioMenuItem* i = dynamic_cast<RadioMenuItem *> (&items.back ());
+                       i->set_active (_panshell->current_panner_uri() == p->first);
+               }
+               _suspend_menu_callbacks = false;
+       }
 }
 
 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)
-{
-       _panner->reset_streampanner (which);
-}
-
-void
-PannerUI::pan_reset_all ()
-{
-       _panner->reset_to_default ();
-}
-
-void
-PannerUI::effective_pan_display ()
+PannerUI::pan_edit ()
 {
-       if (_panner->empty()) {
+       if (_panshell->bypassed()) {
                return;
        }
-
-       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;
+       if (_mono_panner) {
+               _mono_panner->edit ();
+       } else if (_stereo_panner) {
+               _stereo_panner->edit ();
+       } else if (twod_panner) {
+               if (!big_window) {
+                       big_window = new Panner2dWindow (_panshell, 400, _panner->in().n_audio());
+               }
+               big_window->show ();
        }
 }
 
 void
-PannerUI::pan_changed (void *src)
+PannerUI::pan_reset ()
 {
-       if (src == this) {
+       if (_panshell->bypassed()) {
                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;
-       }
+       _panner->reset ();
 }
 
 void
-PannerUI::pan_adjustment_changed (uint32_t which)
-{
-       if (!in_pan_update && which < _panner->npanners()) {
-
-               float xpos;
-               float val = pan_adjustments[which]->get_value ();
-               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->streampanner(which).set_position (val);
-                       /* XXX
-                          the panner objects have no access to the session,
-                          so do this here. ick.
-                       */
-                       _session.set_dirty();
-               }
-       }
+PannerUI::pan_set_custom_type (std::string uri) {
+       if (_suspend_menu_callbacks) return;
+       _panshell->select_panner_by_uri(uri);
 }
 
 void
-PannerUI::pan_value_changed (uint32_t which)
-{
-       ENSURE_GUI_THREAD (bind (mem_fun(*this, &PannerUI::pan_value_changed), which));
-
-       if (_panner->npanners() > 1 && 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)
+PannerUI::effective_pan_display ()
 {
-       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;
+        if (_stereo_panner) {
+                _stereo_panner->queue_draw ();
+        } else if (_mono_panner) {
+                _mono_panner->queue_draw ();
+        } else if (twod_panner) {
+                twod_panner->queue_draw ();
+        }
 }
 
 void
 PannerUI::update_pan_sensitive ()
 {
-       bool sensitive = !(_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 (panner) {
-                       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
@@ -776,7 +538,7 @@ PannerUI::pan_automation_style_button_event (GdkEventButton *ev)
 void
 PannerUI::pan_automation_style_changed ()
 {
-       ENSURE_GUI_THREAD(mem_fun(*this, &PannerUI::pan_automation_style_changed));
+       ENSURE_GUI_THREAD (*this, &PannerUI::pan_automation_style_changed)
 
        switch (_width) {
        case Wide:
@@ -791,32 +553,21 @@ PannerUI::pan_automation_style_changed ()
 void
 PannerUI::pan_automation_state_changed ()
 {
-       ENSURE_GUI_THREAD(mem_fun(*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() != ARDOUR::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;
        }
@@ -828,7 +579,7 @@ PannerUI::pan_automation_state_changed ()
        pan_watching.disconnect();
 
        if (x) {
-               pan_watching = ARDOUR_UI::RapidScreenUpdate.connect (mem_fun (*this, &PannerUI::effective_pan_display));
+               pan_watching = Timers::rapid_connect (sigc::mem_fun (*this, &PannerUI::effective_pan_display));
        }
 }
 
@@ -850,17 +601,17 @@ PannerUI::_astate_string (AutoState state, bool shrt)
        string sstr;
 
        switch (state) {
-       case Off:
-               sstr = (shrt ? "M" : _("M"));
+       case ARDOUR::Off:
+               sstr = (shrt ? "M" : S_("Manual|M"));
                break;
        case Play:
-               sstr = (shrt ? "P" : _("P"));
+               sstr = (shrt ? "P" : S_("Play|P"));
                break;
        case Touch:
-               sstr = (shrt ? "T" : _("T"));
+               sstr = (shrt ? "T" : S_("Touch|T"));
                break;
        case Write:
-               sstr = (shrt ? "W" : _("W"));
+               sstr = (shrt ? "W" : S_("Write|W"));
                break;
        }
 
@@ -890,3 +641,29 @@ PannerUI::_astyle_string (AutoStyle style, bool shrt)
                return (shrt ? _("Abs") : _("Abs"));
        }
 }
+
+void
+PannerUI::show_width ()
+{
+}
+
+void
+PannerUI::width_adjusted ()
+{
+}
+
+void
+PannerUI::show_position ()
+{
+}
+
+void
+PannerUI::position_adjusted ()
+{
+}
+
+void
+PannerUI::set_available_panners(std::map<std::string,std::string> p)
+{
+       _panner_list = p;
+}