smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 11:46:25 +01:00
Code Issues Projects Releases Wiki Activity

fix rebase conflicts left over after pull

Browse source
This commit is contained in:
Paul Davis 2015-10-08 13:40:00 -04:00
parent 0cb1c7b58c
commit 49be513bfa
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/surfaces/mackie/strip.cc
View file

@ -376,8 +376,6 @@ Strip::notify_trim_changed (bool force_update)
queue_parameter_display (TrimAutomation, gain_coefficient); queue_parameter_display (TrimAutomation, gain_coefficient);
} }
_last_trim_position_written = normalized_position; _last_trim_position_written = normalized_position;
queue_display_reset (2000);
} }
} }
} }
@ -980,7 +978,7 @@ Strip::potmode_changed (bool notify)
/* do not change vpot mode while in flipped mode */ /* do not change vpot mode while in flipped mode */
DEBUG_TRACE (DEBUG::MackieControl, "not stepping pot mode - in flip mode\n"); DEBUG_TRACE (DEBUG::MackieControl, "not stepping pot mode - in flip mode\n");
_surface->write (display (1, "Flip")); _surface->write (display (1, "Flip"));
queue_display_reset (1000); block_vpot_mode_display_for (1000);
return; return;
} }
// WIP // WIP