allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

new (commented) continuous scroll from ben; fix for max() issues in MCP code

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@1481 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
2007-02-20 22:32:32 +00:00
parent 326cd24c12
commit 30d4fee414
2 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
gtk2_ardour/editor_mixer.cc
View File

@@ -182,6 +182,9 @@ Editor::update_current_screen ()
if (frame != last_update_frame) {
#ifdef CONTINUOUS_SCROLL
#ifndef CONTINUOUS_SCROLL
if (frame < leftmost_frame || frame > leftmost_frame + current_page_frames()) {
if (session->transport_speed() < 0) {
@@ -197,35 +200,26 @@ Editor::update_current_screen ()
playhead_cursor->set_position (frame);
#undef CONTINUOUS_SCROLL
#ifdef CONTINUOUS_SCROLL
#else // CONTINUOUS_SCROLL
/* don't do continuous scroll till the new position is in the rightmost quarter of the
editor canvas
*/
#if 0
if (frame > leftmost_frame + (3 * current_page_frames() / 4)) {
if (frame > playhead_cursor->current_frame) {
nframes_t delta = frame - playhead_cursor->current_frame;
horizontal_adjustment.set_value (horizontal_adjustment.get_value() + (delta/frames_per_unit));
if (session->transport_speed()) {
double target = ((double)frame - (double)current_page_frames()/2.0) / frames_per_unit;
if (target <= 0.0) target = 0.0;
if ( fabs(target - current) < current_page_frames()/frames_per_unit ) {
target = (target * 0.15) + (current * 0.85);
} else {
nframes_t delta = playhead_cursor->current_frame - frame;
horizontal_adjustment.set_value (horizontal_adjustment.get_value() - (delta/frames_per_unit));
/* relax */
}
//printf("frame: %d, cpf: %d, fpu: %6.6f, current: %6.6f, target : %6.6f\n", frame, current_page_frames(), frames_per_unit, current, target );
current = target;
horizontal_adjustment.set_value ( current );
}
#else
if (!currentInitialized) {
current = (frame - current_page_frames()/2) / frames_per_unit;
currentInitialized = 1;
}
double target = (frame - current_page_frames()/2) / frames_per_unit;
target = (target * 0.1) + (current * 0.9);
horizontal_adjustment.set_value ( target );
current = target;
#endif
playhead_cursor->set_position (frame);
#endif // CONTINUOUS_SCROLL

2
libs/surfaces/mackie/mackie_control_protocol.cc
View File

@@ -1160,7 +1160,7 @@ void MackieControlProtocol::notify_remote_id_changed()
if ( sorted.size() - _current_initial_bank < route_signals.size() )
{
// but don't shift backwards past the zeroth channel
switch_banks( max(0UL, sorted.size() - route_signals.size() ) );
switch_banks( max((Sorted::size_type) 0, sorted.size() - route_signals.size() ) );
}
// Otherwise just refresh the current bank
else