X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fstereo_panner.cc;h=ab923a47be737fece200eed8b01b2792b2f71b12;hb=ad017365f7a73f8ba57f667cc1aa36478b48c50e;hp=6da8a249fcafb6e1dae9dbf7ca416cd425721b3a;hpb=6e79521e8b7709458b8ee093e2d0dc6440ffea2c;p=ardour.git

diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc
index 6da8a249fc..ab923a47be 100644
--- a/gtk2_ardour/stereo_panner.cc
+++ b/gtk2_ardour/stereo_panner.cc
@@ -22,6 +22,7 @@
 #include <cmath>
 
 #include <gtkmm/window.h>
+#include <pangomm/layout.h>
 
 #include "pbd/controllable.h"
 #include "pbd/compose.h"
@@ -30,13 +31,16 @@
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/keyboard.h"
 #include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/persistent_tooltip.h"
 
 #include "ardour/pannable.h"
 #include "ardour/panner.h"
+#include "ardour/panner_shell.h"
 
 #include "ardour_ui.h"
 #include "global_signals.h"
 #include "stereo_panner.h"
+#include "stereo_panner_editor.h"
 #include "rgb_macros.h"
 #include "utils.h"
 
@@ -45,6 +49,7 @@
 using namespace std;
 using namespace Gtk;
 using namespace Gtkmm2ext;
+using namespace ARDOUR_UI_UTILS;
 
 static const int pos_box_size = 8;
 static const int lr_box_size = 15;
@@ -54,13 +59,16 @@ static const int top_step = 2;
 StereoPanner::ColorScheme StereoPanner::colors[3];
 bool StereoPanner::have_colors = false;
 
+Pango::AttrList StereoPanner::panner_font_attributes;
+bool            StereoPanner::have_font = false;
+
 using namespace ARDOUR;
 
-StereoPanner::StereoPanner (boost::shared_ptr<Panner> panner)
-	: PannerInterface (panner)
+StereoPanner::StereoPanner (boost::shared_ptr<PannerShell> p)
+	: PannerInterface (p->panner())
+	, _panner_shell (p)
 	, position_control (_panner->pannable()->pan_azimuth_control)
 	, width_control (_panner->pannable()->pan_width_control)
-	, dragging (false)
 	, dragging_position (false)
 	, dragging_left (false)
 	, dragging_right (false)
@@ -70,16 +78,31 @@ StereoPanner::StereoPanner (boost::shared_ptr<Panner> panner)
 	, detented (false)
 	, position_binder (position_control)
 	, width_binder (width_control)
+	, _dragging (false)
 {
 	if (!have_colors) {
 		set_colors ();
 		have_colors = true;
 	}
+	if (!have_font) {
+		Pango::FontDescription font;
+		Pango::AttrFontDesc* font_attr;
+		font = Pango::FontDescription (ARDOUR_UI::config()->get_canvasvar_SmallBoldMonospaceFont());
+		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 (panvalue_connections, invalidator(*this), boost::bind (&StereoPanner::value_change, this), gui_context());
+	width_control->Changed.connect (panvalue_connections, invalidator(*this), boost::bind (&StereoPanner::value_change, this), gui_context());
 
-	position_control->Changed.connect (connections, invalidator(*this), boost::bind (&StereoPanner::value_change, this), gui_context());
-	width_control->Changed.connect (connections, invalidator(*this), boost::bind (&StereoPanner::value_change, this), gui_context());
+	_panner_shell->Changed.connect (panshell_connections, invalidator (*this), boost::bind (&StereoPanner::bypass_handler, this), gui_context());
+	_panner_shell->PannableChanged.connect (panshell_connections, invalidator (*this), boost::bind (&StereoPanner::pannable_handler, this), gui_context());
 
 	ColorsChanged.connect (sigc::mem_fun (*this, &StereoPanner::color_handler));
+
+	set_tooltip ();
 }
 
 StereoPanner::~StereoPanner ()
@@ -88,12 +111,12 @@ StereoPanner::~StereoPanner ()
 }
 
 void
-StereoPanner::set_drag_data ()
+StereoPanner::set_tooltip ()
 {
-	if (!_drag_data_label) {
+	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.
@@ -105,26 +128,29 @@ StereoPanner::set_drag_data ()
 	*/
 
 	char buf[64];
-	snprintf (buf, sizeof (buf), "L:%3d R:%3d Width:%d%%", (int) rint (100.0 * (1.0 - pos)),
+	snprintf (buf, sizeof (buf), _("L:%3d R:%3d Width:%d%%"), (int) rint (100.0 * (1.0 - pos)),
 	          (int) rint (100.0 * pos),
 	          (int) floor (100.0 * width_control->get_value()));
-	_drag_data_label->set_markup (buf);
+	_tooltip.set_tip (buf);
 }
 
 bool
-StereoPanner::on_expose_event (GdkEventExpose* ev)
+StereoPanner::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();
+	Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create(get_pango_context());
+	layout->set_attributes (panner_font_attributes);
 
+	int tw, th;
 	int width, height;
-	double pos = position_control->get_value (); /* 0..1 */
-	double swidth = width_control->get_value (); /* -1..+1 */
-	double fswidth = fabs (swidth);
+	const double pos = position_control->get_value (); /* 0..1 */
+	const double swidth = width_control->get_value (); /* -1..+1 */
+	const double fswidth = fabs (swidth);
+	const double corner_radius = 5.0;
 	uint32_t o, f, t, b, r;
 	State state;
-	const double corner_radius = 5.0;
 
 	width = get_width();
 	height = get_height ();
@@ -143,11 +169,25 @@ StereoPanner::on_expose_event (GdkEventExpose* ev)
 	b = colors[state].background;
 	r = colors[state].rule;
 
+	if (_panner_shell->bypassed()) {
+		b  = 0x20202040;
+		f  = 0x404040ff;
+		o  = 0x606060ff;
+		t  = 0x606060ff;
+		r  = 0x606060ff;
+	}
+
+	if (_send_mode) {
+		b = rgba_from_style("SendStripBase",
+				UINT_RGBA_R(b), UINT_RGBA_G(b), UINT_RGBA_B(b), 255,
+				"fg");
+	}
 	/* 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));
-	rounded_rectangle (context, 0, 0, width, height, corner_radius);
-	context->fill ();
+	cairo_rectangle (context->cobj(), 0, 0, width, height);
+	context->fill_preserve ();
+	context->clip();
 
 	/* the usable width is reduced from the real width, because we need space for
 	   the two halves of LR boxes that will extend past the actual left/right
@@ -166,17 +206,13 @@ StereoPanner::on_expose_event (GdkEventExpose* ev)
 		context->translate (1.0, 0.0);
 	}
 
-	double center = (lr_box_size/2.0) + (usable_width * pos);
-	const double pan_spread = (fswidth * usable_width)/2.0;
 	const double half_lr_box = lr_box_size/2.0;
-	int left;
-	int right;
-
-	left = center - pan_spread;  // center of left box
-	right = center + pan_spread; // center of right box
+	const double center = rint(half_lr_box + (usable_width * pos));
+	const double pan_spread = rint((fswidth * (usable_width-1.0))/2.0);
+	const double left  = center - pan_spread;
+	const double right = center + pan_spread;
 
 	/* center line */
-
 	context->set_line_width (1.0);
 	context->move_to ((usable_width + lr_box_size)/2.0, 0);
 	context->rel_line_to (0, height);
@@ -184,67 +220,64 @@ StereoPanner::on_expose_event (GdkEventExpose* ev)
 	context->stroke ();
 
 	/* compute & draw the line through the box */
-
 	context->set_line_width (2);
 	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, top_step+(pos_box_size/2.0)+step_down);
-	context->line_to (left, top_step+(pos_box_size/2.0));
-	context->line_to (right, top_step+(pos_box_size/2.0));
-	context->line_to (right, top_step+(pos_box_size/2.0) + step_down);
+	context->move_to (left,  top_step + (pos_box_size/2.0) + step_down + 1.0);
+	context->line_to (left,  top_step + (pos_box_size/2.0));
+	context->line_to (right, top_step + (pos_box_size/2.0));
+	context->line_to (right, top_step + (pos_box_size/2.0) + step_down + 1.0);
 	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_line_width (1.0);
 
+	/* left box */
 	if (state != Mono) {
+		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(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 */
 		context->set_source_rgba (UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t));
 		if (swidth < 0.0) {
-			context->show_text (_("R"));
+			layout->set_text (_("R"));
 		} else {
-			context->show_text (_("L"));
+			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));
+		pango_cairo_show_layout (context->cobj(), layout->gobj());
 	}
 
 	/* right box */
-
 	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 ();
+			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 ();
+	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 */
-
-	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));
 
 	if (state == Mono) {
-		context->show_text (_("M"));
+		layout->set_text (_("M"));
 	} else {
 		if (swidth < 0.0) {
-			context->show_text (_("L"));
+			layout->set_text (_("L"));
 		} else {
-			context->show_text (_("R"));
+			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));
+	pango_cairo_show_layout (context->cobj(), layout->gobj());
 
 	/* draw the central box */
-
 	context->set_line_width (2.0);
 	context->move_to (center + (pos_box_size/2.0), top_step); /* top right */
 	context->rel_line_to (0.0, pos_box_size); /* lower right */
@@ -264,13 +297,22 @@ StereoPanner::on_expose_event (GdkEventExpose* ev)
 bool
 StereoPanner::on_button_press_event (GdkEventButton* ev)
 {
+	if (PannerInterface::on_button_press_event (ev)) {
+		return true;
+	}
+
+	if (_panner_shell->bypassed()) {
+		return true;
+	}
+	
 	drag_start_x = ev->x;
 	last_drag_x = ev->x;
 
 	dragging_position = false;
 	dragging_left = false;
 	dragging_right = false;
-	dragging = false;
+	_dragging = false;
+	_tooltip.target_stop_drag ();
 	accumulated_delta = 0;
 	detented = false;
 
@@ -347,7 +389,8 @@ StereoPanner::on_button_press_event (GdkEventButton* ev)
 			}
 		}
 
-		dragging = false;
+		_dragging = false;
+		_tooltip.target_stop_drag ();
 
 	} else if (ev->type == GDK_BUTTON_PRESS) {
 
@@ -388,7 +431,8 @@ StereoPanner::on_button_press_event (GdkEventButton* ev)
 			StartWidthGesture ();
 		}
 
-		dragging = true;
+		_dragging = true;
+		_tooltip.target_start_drag ();
 	}
 
 	return true;
@@ -397,23 +441,28 @@ StereoPanner::on_button_press_event (GdkEventButton* ev)
 bool
 StereoPanner::on_button_release_event (GdkEventButton* ev)
 {
+	if (PannerInterface::on_button_release_event (ev)) {
+		return true;
+	}
+	
 	if (ev->button != 1) {
 		return false;
 	}
 
+	if (_panner_shell->bypassed()) {
+		return false;
+	}
+
 	bool const dp = dragging_position;
 
-	dragging = false;
+	_dragging = false;
+	_tooltip.target_stop_drag ();
 	dragging_position = false;
 	dragging_left = false;
 	dragging_right = false;
 	accumulated_delta = 0;
 	detented = false;
 
-	if (_drag_data_window) {
-		_drag_data_window->hide ();
-	}
-
 	if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
 		_panner->reset ();
 	} else {
@@ -435,6 +484,10 @@ StereoPanner::on_scroll_event (GdkEventScroll* ev)
 	double wv = width_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 {
@@ -466,47 +519,81 @@ StereoPanner::on_scroll_event (GdkEventScroll* ev)
 bool
 StereoPanner::on_motion_notify_event (GdkEventMotion* ev)
 {
-	if (!dragging) {
+	if (_panner_shell->bypassed()) {
+		_dragging = false;
+	}
+	if (!_dragging) {
 		return false;
 	}
 
-	show_drag_data_window ();
-
-	int w = get_width();
-	double delta = (ev->x - last_drag_x) / (double) w;
+	int usable_width = get_width() - lr_box_size;
+	double delta = (ev->x - last_drag_x) / (double) usable_width;
 	double current_width = width_control->get_value ();
 
 	if (dragging_left) {
 		delta = -delta;
 	}
-
+	
 	if (dragging_left || dragging_right) {
 
-		/* maintain position as invariant as we change the width */
+		if (Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier)) {
 
+			/* change width and position in a way that keeps the
+			 * other side in the same place
+			 */
 
-		/* create a detent close to the center */
+			_panner->freeze ();
+			
+			double pv = position_control->get_value();
 
-		if (!detented && fabs (current_width) < 0.02) {
-			detented = true;
-			/* snap to zero */
-			width_control->set_value (0);
-		}
+			if (dragging_left) {
+				position_control->set_value (pv - delta);
+			} else {
+				position_control->set_value (pv + delta);
+			}
 
-		if (detented) {
+			if (delta > 0.0) {
+				/* delta is positive, so we're about to
+				   increase the width. But we need to increase it
+				   by twice the required value so that the
+				   other side remains in place when we set
+				   the position as well.
+				*/
+				width_control->set_value (current_width + (delta * 2.0));
+			} else {
+				width_control->set_value (current_width + delta);
+			}
 
-			accumulated_delta += delta;
+			_panner->thaw ();
 
-			/* have we pulled far enough to escape ? */
+		} else {
 
-			if (fabs (accumulated_delta) >= 0.025) {
-				width_control->set_value (current_width + accumulated_delta);
-				detented = false;
-				accumulated_delta = false;
+			/* maintain position as invariant as we change the width */
+			
+			/* create a detent close to the center */
+			
+			if (!detented && fabs (current_width) < 0.02) {
+				detented = true;
+				/* snap to zero */
+				width_control->set_value (0);
+			}
+			
+			if (detented) {
+				
+				accumulated_delta += delta;
+				
+				/* have we pulled far enough to escape ? */
+				
+				if (fabs (accumulated_delta) >= 0.025) {
+					width_control->set_value (current_width + accumulated_delta);
+					detented = false;
+					accumulated_delta = false;
+				}
+				
+			} else {
+				/* width needs to change by 2 * delta because both L & R move */
+				width_control->set_value (current_width + (delta * 2.0));
 			}
-
-		} else {
-			width_control->set_value (current_width + delta);
 		}
 
 	} else if (dragging_position) {
@@ -527,6 +614,10 @@ StereoPanner::on_key_press_event (GdkEventKey* ev)
 	double wv = width_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 {
@@ -551,6 +642,7 @@ StereoPanner::on_key_press_event (GdkEventKey* ev)
 		} else {
 			width_control->set_value (wv - step);
 		}
+		break;
 
 	case GDK_Left:
 		pv -= step;
@@ -560,8 +652,6 @@ StereoPanner::on_key_press_event (GdkEventKey* ev)
 		pv += step;
 		position_control->set_value (pv);
 		break;
-
-		break;
 	case GDK_0:
 	case GDK_KP_0:
 		width_control->set_value (0.0);
@@ -577,23 +667,23 @@ StereoPanner::on_key_press_event (GdkEventKey* ev)
 void
 StereoPanner::set_colors ()
 {
-	colors[Normal].fill = ARDOUR_UI::config()->canvasvar_StereoPannerFill.get();
-	colors[Normal].outline = ARDOUR_UI::config()->canvasvar_StereoPannerOutline.get();
-	colors[Normal].text = ARDOUR_UI::config()->canvasvar_StereoPannerText.get();
-	colors[Normal].background = ARDOUR_UI::config()->canvasvar_StereoPannerBackground.get();
-	colors[Normal].rule = ARDOUR_UI::config()->canvasvar_StereoPannerRule.get();
-
-	colors[Mono].fill = ARDOUR_UI::config()->canvasvar_StereoPannerMonoFill.get();
-	colors[Mono].outline = ARDOUR_UI::config()->canvasvar_StereoPannerMonoOutline.get();
-	colors[Mono].text = ARDOUR_UI::config()->canvasvar_StereoPannerMonoText.get();
-	colors[Mono].background = ARDOUR_UI::config()->canvasvar_StereoPannerMonoBackground.get();
-	colors[Mono].rule = ARDOUR_UI::config()->canvasvar_StereoPannerRule.get();
-
-	colors[Inverted].fill = ARDOUR_UI::config()->canvasvar_StereoPannerInvertedFill.get();
-	colors[Inverted].outline = ARDOUR_UI::config()->canvasvar_StereoPannerInvertedOutline.get();
-	colors[Inverted].text = ARDOUR_UI::config()->canvasvar_StereoPannerInvertedText.get();
-	colors[Inverted].background = ARDOUR_UI::config()->canvasvar_StereoPannerInvertedBackground.get();
-	colors[Inverted].rule = ARDOUR_UI::config()->canvasvar_StereoPannerRule.get();
+	colors[Normal].fill = ARDOUR_UI::config()->get_canvasvar_StereoPannerFill();
+	colors[Normal].outline = ARDOUR_UI::config()->get_canvasvar_StereoPannerOutline();
+	colors[Normal].text = ARDOUR_UI::config()->get_canvasvar_StereoPannerText();
+	colors[Normal].background = ARDOUR_UI::config()->get_canvasvar_StereoPannerBackground();
+	colors[Normal].rule = ARDOUR_UI::config()->get_canvasvar_StereoPannerRule();
+
+	colors[Mono].fill = ARDOUR_UI::config()->get_canvasvar_StereoPannerMonoFill();
+	colors[Mono].outline = ARDOUR_UI::config()->get_canvasvar_StereoPannerMonoOutline();
+	colors[Mono].text = ARDOUR_UI::config()->get_canvasvar_StereoPannerMonoText();
+	colors[Mono].background = ARDOUR_UI::config()->get_canvasvar_StereoPannerMonoBackground();
+	colors[Mono].rule = ARDOUR_UI::config()->get_canvasvar_StereoPannerRule();
+
+	colors[Inverted].fill = ARDOUR_UI::config()->get_canvasvar_StereoPannerInvertedFill();
+	colors[Inverted].outline = ARDOUR_UI::config()->get_canvasvar_StereoPannerInvertedOutline();
+	colors[Inverted].text = ARDOUR_UI::config()->get_canvasvar_StereoPannerInvertedText();
+	colors[Inverted].background = ARDOUR_UI::config()->get_canvasvar_StereoPannerInvertedBackground();
+	colors[Inverted].rule = ARDOUR_UI::config()->get_canvasvar_StereoPannerRule();
 }
 
 void
@@ -602,3 +692,29 @@ StereoPanner::color_handler ()
 	set_colors ();
 	queue_draw ();
 }
+
+void
+StereoPanner::bypass_handler ()
+{
+	queue_draw ();
+}
+
+void
+StereoPanner::pannable_handler ()
+{
+	panvalue_connections.drop_connections();
+	position_control = _panner->pannable()->pan_azimuth_control;
+	width_control = _panner->pannable()->pan_width_control;
+	position_binder.set_controllable(position_control);
+	width_binder.set_controllable(width_control);
+
+	position_control->Changed.connect (panvalue_connections, invalidator(*this), boost::bind (&StereoPanner::value_change, this), gui_context());
+	width_control->Changed.connect (panvalue_connections, invalidator(*this), boost::bind (&StereoPanner::value_change, this), gui_context());
+	queue_draw ();
+}
+
+PannerEditor*
+StereoPanner::editor ()
+{
+	return new StereoPannerEditor (this);
+}