diff options
| author | David Robillard <d@drobilla.net> | 2008-10-03 03:16:19 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-10-03 03:16:19 +0000 |
| commit | ec6ab8a04811acd1b548a23ab8f95c27797267fe (patch) | |
| tree | 4b4106dd6cb9a10f56eb423f3e8291f99a7ce2d1 /libs/surfaces | |
| parent | 612850c41b880ef2971a87cd1afa50c077b32c8d (diff) | |
Apply panners/automation patch from torbenh (Panner is-a Processor).
git-svn-id: svn://localhost/ardour2/branches/3.0@3848 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces')
| -rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.cc | 12 | ||||
| -rw-r--r-- | libs/surfaces/mackie/route_signal.cc | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index 4558dc641c..502cea581f 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -862,11 +862,10 @@ void MackieControlProtocol::handle_control_event( SurfacePort & port, Control & { if ( route != 0 ) { - if ( route->panner().size() == 1 ) + if ( route->panner().npanners() == 1 ) { // assume pan for now - float xpos; - route->panner()[0]->get_effective_position (xpos); + float xpos = route->panner().pan_control(0)->get_value (); // calculate new value, and trim xpos += state.delta; @@ -875,7 +874,7 @@ void MackieControlProtocol::handle_control_event( SurfacePort & port, Control & else if ( xpos < 0.0 ) xpos = 0.0; - route->panner()[0]->set_position( xpos ); + route->panner().pan_control(0)->set_value( xpos ); } } else @@ -999,10 +998,9 @@ void MackieControlProtocol::notify_panner_changed( RouteSignal * route_signal ) { Pot & pot = route_signal->strip().vpot(); - if ( route_signal->route().panner().size() == 1 ) + if ( route_signal->route().panner().npanners() == 1 ) { - float pos; - route_signal->route().panner()[0]->get_effective_position( pos); + float pos = route_signal->route().panner().pan_control(0)->get_value(); route_signal->port().write( builder.build_led_ring( pot, ControlState( on, pos ) ) ); } else diff --git a/libs/surfaces/mackie/route_signal.cc b/libs/surfaces/mackie/route_signal.cc index adaeadd805..c21d326fef 100644 --- a/libs/surfaces/mackie/route_signal.cc +++ b/libs/surfaces/mackie/route_signal.cc @@ -41,9 +41,9 @@ void RouteSignal::connect() _name_changed_connection = _route.NameChanged.connect( sigc::bind ( mem_fun ( _mcp, &MackieControlProtocol::notify_name_changed ), this ) ); - if ( _route.panner().size() == 1 ) + if ( _route.panner().npanners() == 1 ) { - _panner_changed_connection = _route.panner()[0]->Changed.connect( sigc::bind ( mem_fun ( _mcp, &MackieControlProtocol::notify_panner_changed ), this ) ); + _panner_changed_connection = _route.panner().pan_control(0)->Changed.connect( sigc::bind ( mem_fun ( _mcp, &MackieControlProtocol::notify_panner_changed ), this ) ); } try |