smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-24 07:27:44 +01:00
Code Issues Projects Releases Wiki Activity

only skip markers backwards when transport is rolling

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2428 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
John Anderson 2007-09-09 07:38:38 +00:00
parent 78cef3909f
commit d0cd7d0048
1 changed files with 1 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

17
libs/surfaces/mackie/mackie_control_protocol.cc
View file

@ -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 )