X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmono_panner.cc;h=da98fcb120611687b2ea43502079acac204c5cdf;hb=625240fe303fcd447bf7205396cdde57918b4d0c;hp=496f67d0073caef0a7e9c7f3856b7c6fb69aaa49;hpb=fc1e7dbb55939c708ce572d3a5c2518ea926a682;p=ardour.git

diff --git a/gtk2_ardour/mono_panner.cc b/gtk2_ardour/mono_panner.cc
index 496f67d007..da98fcb120 100644
--- a/gtk2_ardour/mono_panner.cc
+++ b/gtk2_ardour/mono_panner.cc
@@ -38,19 +38,21 @@
 #include "ardour/panner.h"
 #include "ardour/panner_shell.h"
 
-#include "ardour_ui.h"
 #include "mono_panner.h"
 #include "mono_panner_editor.h"
 #include "rgb_macros.h"
+#include "ui_config.h"
 #include "utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace ARDOUR_UI_UTILS;
 
+using PBD::Controllable;
+
 MonoPanner::ColorScheme MonoPanner::colors;
 bool MonoPanner::have_colors = false;
 
@@ -75,7 +77,7 @@ MonoPanner::MonoPanner (boost::shared_ptr<ARDOUR::PannerShell> p)
 	if (!have_font) {
 		Pango::FontDescription font;
 		Pango::AttrFontDesc* font_attr;
-		font = Pango::FontDescription (ARDOUR_UI::config()->get_SmallBoldMonospaceFont());
+		font = Pango::FontDescription (UIConfiguration::instance().get_SmallBoldMonospaceFont());
 		font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font));
 		panner_font_attributes.change(*font_attr);
 		delete font_attr;
@@ -86,14 +88,14 @@ MonoPanner::MonoPanner (boost::shared_ptr<ARDOUR::PannerShell> p)
 
 	_panner_shell->Changed.connect (panshell_connections, invalidator (*this), boost::bind (&MonoPanner::bypass_handler, this), gui_context());
 	_panner_shell->PannableChanged.connect (panshell_connections, invalidator (*this), boost::bind (&MonoPanner::pannable_handler, this), gui_context());
-	UIConfiguration::ColorsChanged.connect (sigc::mem_fun (*this, &MonoPanner::color_handler));
+	UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &MonoPanner::color_handler));
 
 	set_tooltip ();
 }
 
 MonoPanner::~MonoPanner ()
 {
-	
+
 }
 
 void
@@ -138,7 +140,7 @@ MonoPanner::on_expose_event (GdkEventExpose*)
 	const int lr_box_size = height - 2 * step_down;
 	const int pos_box_size = (int)(rint(step_down * .8)) | 1;
 	const int top_step = step_down - pos_box_size;
-	const double corner_radius = 5 * ARDOUR_UI::ui_scale;
+	const double corner_radius = 5 * UIConfiguration::instance().get_ui_scale();
 
 	o = colors.outline;
 	f = colors.fill;
@@ -157,7 +159,7 @@ MonoPanner::on_expose_event (GdkEventExpose*)
 	}
 
 	if (_send_mode) {
-		b = ARDOUR_UI::config()->color ("send bg");
+		b = UIConfiguration::instance().color ("send bg");
 	}
 	/* 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));
@@ -253,8 +255,8 @@ MonoPanner::on_expose_event (GdkEventExpose*)
 	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 * ARDOUR_UI::ui_scale); /* bottom point */
-	context->rel_line_to (-pos_box_size/2.0, -4.0 * ARDOUR_UI::ui_scale); /* lower left */
+	context->rel_line_to (-pos_box_size/2.0, 4.0 * UIConfiguration::instance().get_ui_scale()); /* bottom point */
+	context->rel_line_to (-pos_box_size/2.0, -4.0 * UIConfiguration::instance().get_ui_scale()); /* lower left */
 	context->rel_line_to (0.0, -pos_box_size); /* upper left */
 	context->close_path ();
 
@@ -266,7 +268,7 @@ MonoPanner::on_expose_event (GdkEventExpose*)
 
 	/* marker line */
 	context->set_line_width (1.0);
-	context->move_to (spos, 1 + top_step + pos_box_size + 4.0 * ARDOUR_UI::ui_scale);
+	context->move_to (spos, 1 + top_step + pos_box_size + 4.0 * UIConfiguration::instance().get_ui_scale());
 	context->line_to (spos, half_lr_box + step_down + lr_box_size - 1);
 	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 ();
@@ -318,11 +320,11 @@ MonoPanner::on_button_press_event (GdkEventButton* ev)
 
 		if (ev->x <= width/3) {
 			/* left side dbl click */
-			position_control->set_value (0);
+			position_control->set_value (0, Controllable::NoGroup);
 		} else if (ev->x > 2*width/3) {
-			position_control->set_value (1.0);
+			position_control->set_value (1.0, Controllable::NoGroup);
 		} else {
-			position_control->set_value (0.5);
+			position_control->set_value (0.5, Controllable::NoGroup);
 		}
 
 		_dragging = false;
@@ -393,12 +395,12 @@ MonoPanner::on_scroll_event (GdkEventScroll* ev)
 		case GDK_SCROLL_UP:
 		case GDK_SCROLL_LEFT:
 			pv -= step;
-			position_control->set_value (pv);
+			position_control->set_value (pv, Controllable::NoGroup);
 			break;
 		case GDK_SCROLL_DOWN:
 		case GDK_SCROLL_RIGHT:
 			pv += step;
-			position_control->set_value (pv);
+			position_control->set_value (pv, Controllable::NoGroup);
 			break;
 	}
 
@@ -423,7 +425,7 @@ MonoPanner::on_motion_notify_event (GdkEventMotion* ev)
 	if (!detented && ARDOUR::Panner::equivalent (position_control->get_value(), 0.5)) {
 		detented = true;
 		/* snap to center */
-		position_control->set_value (0.5);
+		position_control->set_value (0.5, Controllable::NoGroup);
 	}
 
 	if (detented) {
@@ -432,13 +434,13 @@ MonoPanner::on_motion_notify_event (GdkEventMotion* ev)
 		/* have we pulled far enough to escape ? */
 
 		if (fabs (accumulated_delta) >= 0.025) {
-			position_control->set_value (position_control->get_value() + accumulated_delta);
+			position_control->set_value (position_control->get_value() + accumulated_delta, Controllable::NoGroup);
 			detented = false;
 			accumulated_delta = false;
 		}
 	} else {
 		double pv = position_control->get_value(); // 0..1.0 ; 0 = left
-		position_control->set_value (pv + delta);
+		position_control->set_value (pv + delta, Controllable::NoGroup);
 	}
 
 	last_drag_x = ev->x;
@@ -465,15 +467,15 @@ MonoPanner::on_key_press_event (GdkEventKey* ev)
 	switch (ev->keyval) {
 		case GDK_Left:
 			pv -= step;
-			position_control->set_value (pv);
+			position_control->set_value (pv, Controllable::NoGroup);
 			break;
 		case GDK_Right:
 			pv += step;
-			position_control->set_value (pv);
+			position_control->set_value (pv, Controllable::NoGroup);
 			break;
 		case GDK_0:
 		case GDK_KP_0:
-			position_control->set_value (0.0);
+			position_control->set_value (0.0, Controllable::NoGroup);
 			break;
 		default:
 			return false;
@@ -485,12 +487,12 @@ MonoPanner::on_key_press_event (GdkEventKey* ev)
 void
 MonoPanner::set_colors ()
 {
-        colors.fill = ARDOUR_UI::config()->color_mod ("mono panner fill", "panner fill");
-        colors.outline = ARDOUR_UI::config()->color ("mono panner outline");
-        colors.text = ARDOUR_UI::config()->color ("mono panner text");
-        colors.background = ARDOUR_UI::config()->color ("mono panner bg");
-        colors.pos_outline = ARDOUR_UI::config()->color ("mono panner position outline");
-        colors.pos_fill = ARDOUR_UI::config()->color_mod ("mono panner position fill", "mono panner position fill");
+        colors.fill = UIConfiguration::instance().color_mod ("mono panner fill", "panner fill");
+        colors.outline = UIConfiguration::instance().color ("mono panner outline");
+        colors.text = UIConfiguration::instance().color ("mono panner text");
+        colors.background = UIConfiguration::instance().color ("mono panner bg");
+        colors.pos_outline = UIConfiguration::instance().color ("mono panner position outline");
+        colors.pos_fill = UIConfiguration::instance().color_mod ("mono panner position fill", "mono panner position fill");
 }
 
 void