From 35c170937de6150ae09154f96e4920d30e83f6ce Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 15 Jan 2014 02:51:09 +0100 Subject: NOOP, semantic update, don't pannable's panner for direct access. --- libs/surfaces/mackie/strip.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libs/surfaces') diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc index c736b3f7e6..ef4447d900 100644 --- a/libs/surfaces/mackie/strip.cc +++ b/libs/surfaces/mackie/strip.cc @@ -177,7 +177,7 @@ Strip::set_route (boost::shared_ptr r, bool /*with_messages*/) boost::shared_ptr pannable = _route->pannable(); - if (pannable && pannable->panner()) { + if (pannable && _route->panner()) { pannable->pan_azimuth_control->Changed.connect(route_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_panner_azi_changed, this, false), ui_context()); pannable->pan_width_control->Changed.connect(route_connections, MISSING_INVALIDATOR, boost::bind (&Strip::notify_panner_width_changed, this, false), ui_context()); } @@ -211,7 +211,7 @@ Strip::set_route (boost::shared_ptr r, bool /*with_messages*/) possible_pot_parameters.clear(); if (pannable) { - boost::shared_ptr panner = pannable->panner(); + boost::shared_ptr panner = _route->panner(); if (panner) { set automatable = panner->what_can_be_automated (); set::iterator a; @@ -352,7 +352,7 @@ Strip::notify_panner_azi_changed (bool force_update) boost::shared_ptr pannable = _route->pannable(); - if (!pannable || !pannable->panner()) { + if (!pannable || !_route->panner()) { _surface->write (_vpot->zero()); return; } @@ -391,7 +391,7 @@ Strip::notify_panner_width_changed (bool force_update) boost::shared_ptr pannable = _route->pannable(); - if (!pannable || !pannable->panner()) { + if (!pannable || !_route->panner()) { _surface->write (_vpot->zero()); return; } @@ -606,8 +606,8 @@ Strip::do_parameter_display (AutomationType type, float val) case PanAzimuthAutomation: if (_route) { boost::shared_ptr p = _route->pannable(); - if (p && p->panner()) { - string str = p->panner()->value_as_string (p->pan_azimuth_control); + if (p && _route->panner()) { + string str =_route->panner()->value_as_string (p->pan_azimuth_control); _surface->write (display (1, str)); } } -- cgit v1.2.3