fix merge errors with master

1 files changed, 332 insertions, 277 deletions

diff --git a/gtk2_ardour/mono_panner.cc b/gtk2_ardour/mono_panner.cc
index e29ec01b70..1a2b685aeb 100644
--- a/gtk2_ardour/mono_panner.cc
+++ b/gtk2_ardour/mono_panner.cc
@@ -23,6 +23,7 @@
 #include <cmath>
 
 #include <gtkmm/window.h>
+#include <pangomm/layout.h>
 
 #include "pbd/controllable.h"
 #include "pbd/compose.h"
@@ -35,6 +36,7 @@
 
 #include "ardour/pannable.h"
 #include "ardour/panner.h"
+#include "ardour/panner_shell.h"
 
 #include "ardour_ui.h"
 #include "global_signals.h"
@@ -57,23 +59,39 @@ static const int top_step = 2;
 MonoPanner::ColorScheme MonoPanner::colors;
 bool MonoPanner::have_colors = false;
 
-MonoPanner::MonoPanner (boost::shared_ptr<ARDOUR::Panner> panner)
-	: PannerInterface (panner)
+Pango::AttrList MonoPanner::panner_font_attributes;
+bool            MonoPanner::have_font = false;
+
+MonoPanner::MonoPanner (boost::shared_ptr<ARDOUR::PannerShell> p)
+	: PannerInterface (p->panner())
+	, _panner_shell (p)
 	, position_control (_panner->pannable()->pan_azimuth_control)
-        , drag_start_x (0)
-        , last_drag_x (0)
-        , accumulated_delta (0)
-        , detented (false)
-        , position_binder (position_control)
+	, drag_start_x (0)
+	, last_drag_x (0)
+	, accumulated_delta (0)
+	, detented (false)
+	, position_binder (position_control)
 	, _dragging (false)
 {
-        if (!have_colors) {
-                set_colors ();
-                have_colors = true;
-        }
+	if (!have_colors) {
+		set_colors ();
+		have_colors = true;
+	}
+	if (!have_font) {
+		Pango::FontDescription font;
+		Pango::AttrFontDesc* font_attr;
+		font = Pango::FontDescription ("ArdourMono");
+		font.set_weight (Pango::WEIGHT_BOLD);
+		font.set_size(9 * PANGO_SCALE);
+		font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font));
+		panner_font_attributes.change(*font_attr);
+		delete font_attr;
+		have_font = true;
+	}
 
-        position_control->Changed.connect (connections, invalidator(*this), boost::bind (&MonoPanner::value_change, this), gui_context());
+	position_control->Changed.connect (connections, invalidator(*this), boost::bind (&MonoPanner::value_change, this), gui_context());
 
+	_panner_shell->Changed.connect (connections, invalidator (*this), boost::bind (&MonoPanner::bypass_handler, this), gui_context());
 	ColorsChanged.connect (sigc::mem_fun (*this, &MonoPanner::color_handler));
 
 	set_tooltip ();
@@ -87,21 +105,25 @@ MonoPanner::~MonoPanner ()
 void
 MonoPanner::set_tooltip ()
 {
-        double pos = position_control->get_value(); // 0..1
+	if (_panner_shell->bypassed()) {
+		_tooltip.set_tip (_("bypassed"));
+		return;
+	}
+	double pos = position_control->get_value(); // 0..1
 
-        /* We show the position of the center of the image relative to the left & right.
-           This is expressed as a pair of percentage values that ranges from (100,0)
-           (hard left) through (50,50) (hard center) to (0,100) (hard right).
+	/* We show the position of the center of the image relative to the left & right.
+		 This is expressed as a pair of percentage values that ranges from (100,0)
+		 (hard left) through (50,50) (hard center) to (0,100) (hard right).
 
-           This is pretty wierd, but its the way audio engineers expect it. Just remember that
-           the center of the USA isn't Kansas, its (50LA, 50NY) and it will all make sense.
-        */
+		 This is pretty wierd, but its the way audio engineers expect it. Just remember that
+		 the center of the USA isn't Kansas, its (50LA, 50NY) and it will all make sense.
+		 */
 
-        char buf[64];
-        snprintf (buf, sizeof (buf), _("L:%3d R:%3d"),
-                  (int) rint (100.0 * (1.0 - pos)),
-                  (int) rint (100.0 * pos));
-        _tooltip.set_tip (buf);
+	char buf[64];
+	snprintf (buf, sizeof (buf), _("L:%3d R:%3d"),
+			(int) rint (100.0 * (1.0 - pos)),
+			(int) rint (100.0 * pos));
+	_tooltip.set_tip (buf);
 }
 
 bool
@@ -109,137 +131,146 @@ MonoPanner::on_expose_event (GdkEventExpose*)
 {
 	Glib::RefPtr<Gdk::Window> win (get_window());
 	Glib::RefPtr<Gdk::GC> gc (get_style()->get_base_gc (get_state()));
-        Cairo::RefPtr<Cairo::Context> context = get_window()->create_cairo_context();
-
-        int width, height;
-        double pos = position_control->get_value (); /* 0..1 */
-        uint32_t o, f, t, b, pf, po;
-        const double corner_radius = 5;
-
-        width = get_width();
-        height = get_height ();
-
-        o = colors.outline;
-        f = colors.fill;
-        t = colors.text;
-        b = colors.background;
-        pf = colors.pos_fill;
-        po = colors.pos_outline;
-
-        /* background */
-
-        context->set_source_rgba (UINT_RGBA_R_FLT(b), UINT_RGBA_G_FLT(b), UINT_RGBA_B_FLT(b), UINT_RGBA_A_FLT(b));
-        context->rectangle (0, 0, width, height);
-        context->fill ();
-
-        double usable_width = width - pos_box_size;
-
-        /* compute the centers of the L/R boxes based on the current stereo width */
-
-        if (fmod (usable_width,2.0) == 0) {
-                /* even width, but we need odd, so that there is an exact center.
-                   So, offset cairo by 1, and reduce effective width by 1
-                */
-                usable_width -= 1.0;
-                context->translate (1.0, 0.0);
-        }
-
-        const double half_lr_box = lr_box_size/2.0;
-        double left;
-        double right;
-
-        left = 4 + half_lr_box; // center of left box
-        right = width  - 4 - half_lr_box; // center of right box
-
-        /* center line */
-        context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o));
-        context->set_line_width (1.0);
-        context->move_to ((pos_box_size/2.0) + (usable_width/2.0), 0);
-        context->line_to ((pos_box_size/2.0) + (usable_width/2.0), height);
-        context->stroke ();
-
-        /* left box */
-
-        rounded_rectangle (context,
-                          left - half_lr_box,
-                          half_lr_box+step_down,
-                          lr_box_size, lr_box_size, corner_radius);
-        context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o));
-        context->stroke_preserve ();
-        context->set_source_rgba (UINT_RGBA_R_FLT(f), UINT_RGBA_G_FLT(f), UINT_RGBA_B_FLT(f), UINT_RGBA_A_FLT(f));
-	context->fill ();
-
-        /* add text */
-
-        context->move_to (
-                       left - half_lr_box + 3,
-                       (lr_box_size/2) + step_down + 13);
-        context->select_font_face ("sans-serif", Cairo::FONT_SLANT_NORMAL, Cairo::FONT_WEIGHT_BOLD);
-        context->set_source_rgba (UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t));
-        context->show_text (_("L"));
-
-        /* right box */
+	Cairo::RefPtr<Cairo::Context> context = get_window()->create_cairo_context();
+
+	int width, height;
+	double pos = position_control->get_value (); /* 0..1 */
+	uint32_t o, f, t, b, pf, po;
+	const double corner_radius = 5;
+
+	width = get_width();
+	height = get_height ();
+
+	o = colors.outline;
+	f = colors.fill;
+	t = colors.text;
+	b = colors.background;
+	pf = colors.pos_fill;
+	po = colors.pos_outline;
+
+	if (_panner_shell->bypassed()) {
+		b  = 0x20202040;
+		f  = 0x404040ff;
+		o  = 0x606060ff;
+		po = 0x606060ff;
+		pf = 0x404040ff;
+		t  = 0x606060ff;
+	}
 
-        rounded_rectangle (context,
-                           right - half_lr_box,
-                           half_lr_box+step_down,
-                           lr_box_size, lr_box_size, corner_radius);
-        context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o));
-        context->stroke_preserve ();
-        context->set_source_rgba (UINT_RGBA_R_FLT(f), UINT_RGBA_G_FLT(f), UINT_RGBA_B_FLT(f), UINT_RGBA_A_FLT(f));
+	/* background */
+	context->set_source_rgba (UINT_RGBA_R_FLT(b), UINT_RGBA_G_FLT(b), UINT_RGBA_B_FLT(b), UINT_RGBA_A_FLT(b));
+	context->rectangle (0, 0, width, height);
 	context->fill ();
 
-        /* add text */
-
-        context->move_to (
-                       right - half_lr_box + 3,
-                       (lr_box_size/2)+step_down + 13);
-        context->set_source_rgba (UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t));
-        context->show_text (_("R"));
-
-        /* 2 lines that connect them both */
-        context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o));
-        context->set_line_width (1.0);
-
-        /* make the lines a little longer than they need to be, because the corners of
-           the boxes are rounded and we don't want a gap
-        */
-        context->move_to (left + half_lr_box - corner_radius, half_lr_box+step_down);
-        context->line_to (right - half_lr_box + corner_radius, half_lr_box+step_down);
-        context->stroke ();
 
+	double usable_width = width - pos_box_size;
 
-        context->move_to (left + half_lr_box - corner_radius, half_lr_box+step_down+lr_box_size);
-        context->line_to (right - half_lr_box + corner_radius, half_lr_box+step_down+lr_box_size);
-        context->stroke ();
-
-        /* draw the position indicator */
+	/* compute the centers of the L/R boxes based on the current stereo width */
+	if (fmod (usable_width,2.0) == 0) {
+		usable_width -= 1.0;
+	}
+	const double half_lr_box = lr_box_size/2.0;
+	const double left = 4 + half_lr_box; // center of left box
+	const double right = width - 4 - half_lr_box; // center of right box
+
+	/* center line */
+	context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o));
+	context->set_line_width (1.0);
+	context->move_to ((pos_box_size/2.0) + (usable_width/2.0), 0);
+	context->line_to ((pos_box_size/2.0) + (usable_width/2.0), height);
+	context->stroke ();
+
+	context->set_line_width (1.0);
+	/* left box */
+
+	rounded_left_half_rectangle (context,
+			left - half_lr_box + .5,
+			half_lr_box + step_down,
+			lr_box_size, lr_box_size, corner_radius);
+	context->set_source_rgba (UINT_RGBA_R_FLT(f), UINT_RGBA_G_FLT(f), UINT_RGBA_B_FLT(f), UINT_RGBA_A_FLT(f));
+	context->fill_preserve ();
+	context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o));
+	context->stroke();
+
+	/* add text */
+	int tw, th;
+	Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create(get_pango_context());
+	layout->set_attributes (panner_font_attributes);
+
+	layout->set_text (_("L"));
+	layout->get_pixel_size(tw, th);
+	context->move_to (rint(left - tw/2), rint(lr_box_size + step_down - th/2));
+	context->set_source_rgba (UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t));
+	pango_cairo_show_layout (context->cobj(), layout->gobj());
+
+	/* right box */
+	rounded_right_half_rectangle (context,
+			right - half_lr_box - .5,
+			half_lr_box + step_down,
+			lr_box_size, lr_box_size, corner_radius);
+	context->set_source_rgba (UINT_RGBA_R_FLT(f), UINT_RGBA_G_FLT(f), UINT_RGBA_B_FLT(f), UINT_RGBA_A_FLT(f));
+	context->fill_preserve ();
+	context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o));
+	context->stroke();
+
+	/* add text */
+	layout->set_text (_("R"));
+	layout->get_pixel_size(tw, th);
+	context->move_to (rint(right - tw/2), rint(lr_box_size + step_down - th/2));
+	context->set_source_rgba (UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t));
+	pango_cairo_show_layout (context->cobj(), layout->gobj());
+
+	/* 2 lines that connect them both */
+	context->set_line_width (1.0);
+
+	if (_panner_shell->panner_gui_uri() != "http://ardour.org/plugin/panner_balance#ui") {
+		context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o));
+		context->move_to (left  + half_lr_box, half_lr_box + step_down);
+		context->line_to (right - half_lr_box, half_lr_box + step_down);
+		context->stroke ();
+
+		context->move_to (left  + half_lr_box, half_lr_box+step_down+lr_box_size);
+		context->line_to (right - half_lr_box, half_lr_box+step_down+lr_box_size);
+		context->stroke ();
+	} else {
+		context->move_to (left  + half_lr_box, half_lr_box+step_down+lr_box_size);
+		context->line_to (left  + half_lr_box, half_lr_box + step_down);
+		context->line_to ((pos_box_size/2.0) + (usable_width/2.0), half_lr_box+step_down+lr_box_size);
+		context->line_to (right - half_lr_box, half_lr_box + step_down);
+		context->line_to (right - half_lr_box, half_lr_box+step_down+lr_box_size);
+		context->close_path();
+
+		context->set_source_rgba (UINT_RGBA_R_FLT(f), UINT_RGBA_G_FLT(f), UINT_RGBA_B_FLT(f), UINT_RGBA_A_FLT(f));
+		context->fill_preserve ();
+		context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o));
+		context->stroke ();
+	}
 
-        double spos = (pos_box_size/2.0) + (usable_width * pos);
+	/* draw the position indicator */
+	double spos = (pos_box_size/2.0) + (usable_width * pos);
 
-        context->set_line_width (2.0);
+	context->set_line_width (2.0);
 	context->move_to (spos + (pos_box_size/2.0), top_step); /* top right */
-        context->rel_line_to (0.0, pos_box_size); /* lower right */
-        context->rel_line_to (-pos_box_size/2.0, 4.0); /* bottom point */
-        context->rel_line_to (-pos_box_size/2.0, -4.0); /* lower left */
-        context->rel_line_to (0.0, -pos_box_size); /* upper left */
-        context->close_path ();
+	context->rel_line_to (0.0, pos_box_size); /* lower right */
+	context->rel_line_to (-pos_box_size/2.0, 4.0); /* bottom point */
+	context->rel_line_to (-pos_box_size/2.0, -4.0); /* lower left */
+	context->rel_line_to (0.0, -pos_box_size); /* upper left */
+	context->close_path ();
 
 
-        context->set_source_rgba (UINT_RGBA_R_FLT(po), UINT_RGBA_G_FLT(po), UINT_RGBA_B_FLT(po), UINT_RGBA_A_FLT(po));
-        context->stroke_preserve ();
-        context->set_source_rgba (UINT_RGBA_R_FLT(pf), UINT_RGBA_G_FLT(pf), UINT_RGBA_B_FLT(pf), UINT_RGBA_A_FLT(pf));
+	context->set_source_rgba (UINT_RGBA_R_FLT(po), UINT_RGBA_G_FLT(po), UINT_RGBA_B_FLT(po), UINT_RGBA_A_FLT(po));
+	context->stroke_preserve ();
+	context->set_source_rgba (UINT_RGBA_R_FLT(pf), UINT_RGBA_G_FLT(pf), UINT_RGBA_B_FLT(pf), UINT_RGBA_A_FLT(pf));
 	context->fill ();
 
-        /* marker line */
-
-        context->set_line_width (1.0);
-        context->move_to (spos, pos_box_size+4);
-        context->rel_line_to (0, half_lr_box+step_down);
-        context->set_source_rgba (UINT_RGBA_R_FLT(po), UINT_RGBA_G_FLT(po), UINT_RGBA_B_FLT(po), UINT_RGBA_A_FLT(po));
-        context->stroke ();
+	/* marker line */
+	context->set_line_width (1.0);
+	context->move_to (spos, pos_box_size + 5);
+	context->rel_line_to (0, half_lr_box+step_down);
+	context->set_source_rgba (UINT_RGBA_R_FLT(po), UINT_RGBA_G_FLT(po), UINT_RGBA_B_FLT(po), UINT_RGBA_A_FLT(po));
+	context->stroke ();
 
-        /* done */
+	/* done */
 
 	return true;
 }
@@ -250,62 +281,65 @@ MonoPanner::on_button_press_event (GdkEventButton* ev)
 	if (PannerInterface::on_button_press_event (ev)) {
 		return true;
 	}
-	
-        drag_start_x = ev->x;
-        last_drag_x = ev->x;
+	if (_panner_shell->bypassed()) {
+		return false;
+	}
 
-        _dragging = false;
+	drag_start_x = ev->x;
+	last_drag_x = ev->x;
+
+	_dragging = false;
 	_tooltip.target_stop_drag ();
-        accumulated_delta = 0;
-        detented = false;
+	accumulated_delta = 0;
+	detented = false;
 
-        /* Let the binding proxies get first crack at the press event
-         */
+	/* Let the binding proxies get first crack at the press event
+	*/
 
-        if (ev->y < 20) {
-                if (position_binder.button_press_handler (ev)) {
-                        return true;
-                }
-        }
+	if (ev->y < 20) {
+		if (position_binder.button_press_handler (ev)) {
+			return true;
+		}
+	}
 
-        if (ev->button != 1) {
-                return false;
-        }
+	if (ev->button != 1) {
+		return false;
+	}
 
-        if (ev->type == GDK_2BUTTON_PRESS) {
-                int width = get_width();
+	if (ev->type == GDK_2BUTTON_PRESS) {
+		int width = get_width();
 
-                if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
-                        /* handled by button release */
-                        return true;
-                }
+		if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
+			/* handled by button release */
+			return true;
+		}
 
 
-                if (ev->x <= width/3) {
-                        /* left side dbl click */
-                        position_control->set_value (0);
-                } else if (ev->x > 2*width/3) {
-                        position_control->set_value (1.0);
-                } else {
-                        position_control->set_value (0.5);
-                }
+		if (ev->x <= width/3) {
+			/* left side dbl click */
+			position_control->set_value (0);
+		} else if (ev->x > 2*width/3) {
+			position_control->set_value (1.0);
+		} else {
+			position_control->set_value (0.5);
+		}
 
-                _dragging = false;
+		_dragging = false;
 		_tooltip.target_stop_drag ();
 
-        } else if (ev->type == GDK_BUTTON_PRESS) {
+	} else if (ev->type == GDK_BUTTON_PRESS) {
 
-                if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
-                        /* handled by button release */
-                        return true;
-                }
+		if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
+			/* handled by button release */
+			return true;
+		}
 
-                _dragging = true;
+		_dragging = true;
 		_tooltip.target_start_drag ();
-                StartGesture ();
-        }
+		StartGesture ();
+	}
 
-        return true;
+	return true;
 }
 
 bool
@@ -315,121 +349,136 @@ MonoPanner::on_button_release_event (GdkEventButton* ev)
 		return true;
 	}
 
-        if (ev->button != 1) {
-                return false;
-        }
+	if (ev->button != 1) {
+		return false;
+	}
 
-        _dragging = false;
+	if (_panner_shell->bypassed()) {
+		return false;
+	}
+
+	_dragging = false;
 	_tooltip.target_stop_drag ();
-        accumulated_delta = 0;
-        detented = false;
+	accumulated_delta = 0;
+	detented = false;
 
-        if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
+	if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
 		_panner->reset ();
-        } else {
-                StopGesture ();
-        }
+	} else {
+		StopGesture ();
+	}
 
-        return true;
+	return true;
 }
 
 bool
 MonoPanner::on_scroll_event (GdkEventScroll* ev)
 {
-        double one_degree = 1.0/180.0; // one degree as a number from 0..1, since 180 degrees is the full L/R axis
-        double pv = position_control->get_value(); // 0..1.0 ; 0 = left
-        double step;
-
-        if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) {
-                step = one_degree;
-        } else {
-                step = one_degree * 5.0;
-        }
-
-        switch (ev->direction) {
-        case GDK_SCROLL_UP:
-        case GDK_SCROLL_LEFT:
-                pv -= step;
-                position_control->set_value (pv);
-                break;
-        case GDK_SCROLL_DOWN:
-        case GDK_SCROLL_RIGHT:
-                pv += step;
-                position_control->set_value (pv);
-                break;
-        }
-
-        return true;
+	double one_degree = 1.0/180.0; // one degree as a number from 0..1, since 180 degrees is the full L/R axis
+	double pv = position_control->get_value(); // 0..1.0 ; 0 = left
+	double step;
+
+	if (_panner_shell->bypassed()) {
+		return false;
+	}
+
+	if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) {
+		step = one_degree;
+	} else {
+		step = one_degree * 5.0;
+	}
+
+	switch (ev->direction) {
+		case GDK_SCROLL_UP:
+		case GDK_SCROLL_LEFT:
+			pv -= step;
+			position_control->set_value (pv);
+			break;
+		case GDK_SCROLL_DOWN:
+		case GDK_SCROLL_RIGHT:
+			pv += step;
+			position_control->set_value (pv);
+			break;
+	}
+
+	return true;
 }
 
 bool
 MonoPanner::on_motion_notify_event (GdkEventMotion* ev)
 {
-        if (!_dragging) {
-                return false;
-        }
-
-        int w = get_width();
-        double delta = (ev->x - last_drag_x) / (double) w;
-
-        /* create a detent close to the center */
-
-        if (!detented && ARDOUR::Panner::equivalent (position_control->get_value(), 0.5)) {
-                detented = true;
-                /* snap to center */
-                position_control->set_value (0.5);
-        }
-
-        if (detented) {
-                accumulated_delta += delta;
-
-                /* have we pulled far enough to escape ? */
-
-                if (fabs (accumulated_delta) >= 0.025) {
-                        position_control->set_value (position_control->get_value() + accumulated_delta);
-                        detented = false;
-                        accumulated_delta = false;
-                }
-        } else {
-                double pv = position_control->get_value(); // 0..1.0 ; 0 = left
-                position_control->set_value (pv + delta);
-        }
-
-        last_drag_x = ev->x;
-        return true;
+	if (_panner_shell->bypassed()) {
+		_dragging = false;
+	}
+	if (!_dragging) {
+		return false;
+	}
+
+	int w = get_width();
+	double delta = (ev->x - last_drag_x) / (double) w;
+
+	/* create a detent close to the center */
+
+	if (!detented && ARDOUR::Panner::equivalent (position_control->get_value(), 0.5)) {
+		detented = true;
+		/* snap to center */
+		position_control->set_value (0.5);
+	}
+
+	if (detented) {
+		accumulated_delta += delta;
+
+		/* have we pulled far enough to escape ? */
+
+		if (fabs (accumulated_delta) >= 0.025) {
+			position_control->set_value (position_control->get_value() + accumulated_delta);
+			detented = false;
+			accumulated_delta = false;
+		}
+	} else {
+		double pv = position_control->get_value(); // 0..1.0 ; 0 = left
+		position_control->set_value (pv + delta);
+	}
+
+	last_drag_x = ev->x;
+	return true;
 }
 
 bool
 MonoPanner::on_key_press_event (GdkEventKey* ev)
 {
-        double one_degree = 1.0/180.0;
-        double pv = position_control->get_value(); // 0..1.0 ; 0 = left
-        double step;
-
-        if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) {
-                step = one_degree;
-        } else {
-                step = one_degree * 5.0;
-        }
-
-        switch (ev->keyval) {
-        case GDK_Left:
-                pv -= step;
-                position_control->set_value (pv);
-                break;
-        case GDK_Right:
-                pv += step;
-                position_control->set_value (pv);
-                break;
-	case GDK_0:
-	case GDK_KP_0:
-		position_control->set_value (0.0);
-		break;
-        default:
-                return false;
-        }
-
-        return true;
+	double one_degree = 1.0/180.0;
+	double pv = position_control->get_value(); // 0..1.0 ; 0 = left
+	double step;
+
+	if (_panner_shell->bypassed()) {
+		return false;
+	}
+
+	if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) {
+		step = one_degree;
+	} else {
+		step = one_degree * 5.0;
+	}
+
+	switch (ev->keyval) {
+		case GDK_Left:
+			pv -= step;
+			position_control->set_value (pv);
+			break;
+		case GDK_Right:
+			pv += step;
+			position_control->set_value (pv);
+			break;
+		case GDK_0:
+		case GDK_KP_0:
+			position_control->set_value (0.0);
+			break;
+		default:
+			return false;
+	}
+
+	return true;
 }
 
 void
@@ -450,6 +499,12 @@ MonoPanner::color_handler ()
 	queue_draw ();
 }
 
+void
+MonoPanner::bypass_handler ()
+{
+	queue_draw ();
+}
+
 PannerEditor*
 MonoPanner::editor ()
 {