Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-23 09:20:16 +01:00
Code Issues Releases Wiki Activity

Bugs 2558 2559: After clip left/right, selection start can be wrong

Browse Source 
Problem:
In DoClipMove() in ClipMenus.cpp, there are a couple of problems in the code for the adjustment of the new value t0 due to potential rounding errors:
1. The code uses the start and end of intervals, and these values are not updated after the move.
2. It's assumed that the same correction is valid for all track types.

Fix:
Implement an adjustment which depends on track type, and does not use the start and end values of intervals.
This commit is contained in:
David Bailes
2020-10-07 13:27:09 +01:00
parent 22dbe0a17a
commit cce2c7b883
5 changed files with 49 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/menus/ClipMenus.cpp
View File

@@ -662,24 +662,18 @@ double DoClipMove( AudacityProject &project, Track *track,
auto hSlideAmount = state.DoSlideHorizontal( desiredSlideAmount );
// update t0 and t1. There is the possibility that the updated
// t0 may no longer be within the clip due to rounding errors,
// so t0 is adjusted so that it is.
double newT0 = t0 + hSlideAmount;
if (hitTestResult != TrackShifter::HitTestResult::Track) {
// pShifter is still undestroyed in the ClipMoveState
auto &intervals = pShifter->MovingIntervals();
if ( !intervals.empty() ) {
auto &interval = intervals[0];
if (newT0 < interval.Start())
newT0 = interval.Start();
if (newT0 > interval.End())
newT0 = interval.End();
double diff = selectedRegion.duration();
selectedRegion.setTimes(newT0, newT0 + diff);
}
// If necessary, correct for rounding errors. For example,
// for a wavetrack, ensure that t0 is still in the clip
// which it was within before the move.
// (pShifter is still undestroyed in the ClipMoveState.)
newT0 = pShifter->AdjustT0(newT0);
}
double diff = selectedRegion.duration();
selectedRegion.setTimes(newT0, newT0 + diff);
return hSlideAmount;
};
return 0.0;