diff options
| author | John Anderson <ardour@semiosix.com> | 2007-07-31 10:52:23 +0000 |
|---|---|---|
| committer | John Anderson <ardour@semiosix.com> | 2007-07-31 10:52:23 +0000 |
| commit | 2def7ef1abd7a30e05aa25aebd02e7987946bf1a (patch) | |
| tree | f011d8764bbcebf38a2091cd4004f4cf5ae626d5 /libs/surfaces/mackie/mackie_control_protocol.cc | |
| parent | 0259d682595f966528904cd9b1f99c4380aa2751 (diff) | |
Add Control::in_use. Add a timeout-generated stop event to Pot.
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2197 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces/mackie/mackie_control_protocol.cc')
| -rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index d0b977c57f..de532e28fa 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -478,7 +478,7 @@ bool MackieControlProtocol::handle_strip_button( Control & control, ButtonState if ( control.name() == "fader_touch" ) { state = bs == press; - control.strip().gain().touch( state ); + control.strip().gain().in_use( state ); } return state; @@ -831,6 +831,7 @@ void MackieControlProtocol::handle_control_event( SurfacePort & port, Control & switch ( control.type() ) { case Control::type_fader: + // TODO this seems to be a duplicate of the above if if ( control.group().is_strip() ) { // find the route in the route table for the id @@ -984,7 +985,7 @@ void MackieControlProtocol::notify_gain_changed( RouteSignal * route_signal ) try { Fader & fader = route_signal->strip().gain(); - if ( !fader.touch() ) + if ( !fader.in_use() ) { route_signal->port().write( builder.build_fader( fader, gain_to_slider_position( route_signal->route().effective_gain() ) ) ); } |