diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-02-22 18:44:22 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-02-22 18:44:22 +0000 |
| commit | 75abb09f32c3c4f39e1356bd2caac44182febb02 (patch) | |
| tree | 77214bd64517cc734e63dde5a5792ce24df1acd6 /libs/surfaces | |
| parent | 14277ff831c90dbdd1131a44eac86da919bb0544 (diff) | |
remove semantic-free Panner::Changed signal; make mackie code pay attention to actual pan controls; make GUI watch PannerShell::Changed for news that the currently chosen panner has changed or changed configuration
git-svn-id: svn://localhost/ardour2/branches/3.0@8924 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces')
| -rw-r--r-- | libs/surfaces/mackie/route_signal.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libs/surfaces/mackie/route_signal.cc b/libs/surfaces/mackie/route_signal.cc index f6db125b8c..bd75a06309 100644 --- a/libs/surfaces/mackie/route_signal.cc +++ b/libs/surfaces/mackie/route_signal.cc @@ -20,7 +20,7 @@ #include "ardour/route.h" #include "ardour/track.h" #include "ardour/midi_ui.h" -#include "ardour/panner.h" +#include "ardour/pannable.h" #include "ardour/session_object.h" // for Properties::name #include "mackie_control_protocol.h" @@ -50,8 +50,9 @@ void RouteSignal::connect() _route->PropertyChanged.connect (connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::notify_property_changed, &_mcp, _1, this), midi_ui_context()); - if (_route->panner()) { - _route->panner()->Changed.connect(connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::notify_panner_changed, &_mcp, this, false), midi_ui_context()); + if (_route->pannable()) { + _route->pannable()->pan_azimuth_control->Changed.connect(connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::notify_panner_changed, &_mcp, this, false), midi_ui_context()); + _route->pannable()->pan_width_control->Changed.connect(connections, MISSING_INVALIDATOR, ui_bind (&MackieControlProtocol::notify_panner_changed, &_mcp, this, false), midi_ui_context()); } boost::shared_ptr<Track> trk = boost::dynamic_pointer_cast<ARDOUR::Track>(_route); |