summaryrefslogtreecommitdiff
path: root/libs/surfaces
diff options
context:
space:
mode:
authorJohn Anderson <ardour@semiosix.com>2007-09-09 07:38:38 +0000
committerJohn Anderson <ardour@semiosix.com>2007-09-09 07:38:38 +0000
commitd0cd7d0048830a0ebe61e207b8522e69c72ec7f3 (patch)
tree55f4ce5f3564b66505231affa64edbeaed4ee8f0 /libs/surfaces
parent78cef3909f08a413aa6230859d7032e60ca0db3d (diff)
only skip markers backwards when transport is rolling
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2428 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces')
-rw-r--r--libs/surfaces/mackie/mackie_control_protocol.cc17
1 files changed, 1 insertions, 16 deletions
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index afde7a55ae..11561d61ed 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -918,9 +918,6 @@ void MackieControlProtocol::notify_solo_changed( RouteSignal * route_signal )
try
{
Button & button = route_signal->strip().solo();
-#ifdef DEBUG
- cout << "updating " << button << endl;
-#endif
route_signal->port().write( builder.build_led( button, route_signal->route().soloed() ) );
}
catch( exception & e )
@@ -934,9 +931,6 @@ void MackieControlProtocol::notify_mute_changed( RouteSignal * route_signal )
try
{
Button & button = route_signal->strip().mute();
-#ifdef DEBUG
- cout << "updating " << button << endl;
-#endif
route_signal->port().write( builder.build_led( button, route_signal->route().muted() ) );
}
catch( exception & e )
@@ -950,9 +944,6 @@ void MackieControlProtocol::notify_record_enable_changed( RouteSignal * route_si
try
{
Button & button = route_signal->strip().recenable();
-#ifdef DEBUG
- cout << "updating " << button << endl;
-#endif
route_signal->port().write( builder.build_led( button, route_signal->route().record_enabled() ) );
}
catch( exception & e )
@@ -966,9 +957,6 @@ void MackieControlProtocol::notify_gain_changed( RouteSignal * route_signal )
try
{
Fader & fader = route_signal->strip().gain();
-#ifdef DEBUG
- cout << "updating " << fader << endl;
-#endif
if ( !fader.in_use() )
{
route_signal->port().write( builder.build_fader( fader, route_signal->route().gain_control().get_value() ) );
@@ -1015,9 +1003,6 @@ void MackieControlProtocol::notify_panner_changed( RouteSignal * route_signal )
try
{
Pot & pot = route_signal->strip().vpot();
-#ifdef DEBUG
- cout << "updating " << pot << endl;
-#endif
const Panner & panner = route_signal->route().panner();
if ( panner.size() == 1 || ( panner.size() == 2 && panner.linked() ) )
{
@@ -1081,7 +1066,7 @@ LedState MackieControlProtocol::frm_left_press( Button & button )
);
// allow a quick double to go past a previous mark
- if ( elapsed < 500 && loc != 0)
+ if ( session->transport_rolling() && elapsed < 500 && loc != 0 )
{
Location * loc_two_back = session->locations()->first_location_before ( loc->start() );
if ( loc_two_back != 0 )