diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2016-01-02 04:58:23 -0500 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-01-02 04:58:30 -0500 |
commit | 9e3299f97da874a48f67dc5ff0e0f87a6a54768a (patch) | |
tree | 460d8bd46c20c72fbaac2ea917da32bb95d42124 /gtk2_ardour/mono_panner.cc | |
parent | 38f199e35565e58d48f68eafa3e5873d9787c55c (diff) |
change Controllable::set_value() API to include grouped control consideration.
This also removes Route::group_gain_control() and associated machinery.
Not yet tested with Mackie or other surfaces. More work to done to
start using the group capabilities, and also potentially to add
or derive more controls as RouteAutomationControls
Diffstat (limited to 'gtk2_ardour/mono_panner.cc')
-rw-r--r-- | gtk2_ardour/mono_panner.cc | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/gtk2_ardour/mono_panner.cc b/gtk2_ardour/mono_panner.cc index 23b64eee28..0dd54ef6ac 100644 --- a/gtk2_ardour/mono_panner.cc +++ b/gtk2_ardour/mono_panner.cc @@ -51,6 +51,8 @@ using namespace Gtk; using namespace Gtkmm2ext; using namespace ARDOUR_UI_UTILS; +using PBD::Controllable; + MonoPanner::ColorScheme MonoPanner::colors; bool MonoPanner::have_colors = false; @@ -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; |