Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-19 09:01:15 +02:00
Code Issues Releases Wiki Activity

Time Shift left/right commands: can fail for stereo track.

Browse Source 
Time Shift left/right commands do not work on the right hand channel of a stereo track when clips are not aligned.
This has been a problem since 3.3.0. Between 2.3.1 and 2.4.2 they moved a clip in the right hand channel more than they should, so moving the clip more than the cursor.

Problems and fixes, both in DoClipMove():
1. The reason for the commands not working at all was the track rather than the channel was been passed in the call MakeTrackShifter::Call( *channel, project )
2. The reason for the clip being moved more than it should, was the left hand channel always being passed as the captured track in the call:
state.Init( project, pShifter->GetTrack(), hitTestResult, std::move( uShifter ),
         t0, viewInfo, trackList, syncLocked )

(cherry picked from audacity commit 405847092231f2cf1ddaec25855daa2feeccc566)

Signed-off-by: akleja <storspov@gmail.com>
This commit is contained in:
David Bailes
2021-08-13 10:22:27 +01:00
committed by akleja
parent 0643115f15
commit 607e60ab4d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/menus/ClipMenus.cpp
View File

@@ -643,7 +643,7 @@ double DoClipMove( AudacityProject &project, Track *track,
// Find the first channel that has a clip at time t0
auto hitTestResult = TrackShifter::HitTestResult::Track;
for (auto channel : TrackList::Channels(track) ) {
uShifter = MakeTrackShifter::Call( *track, project );
uShifter = MakeTrackShifter::Call( *channel, project );
if ( (hitTestResult = uShifter->HitTest( t0, viewInfo )) ==
TrackShifter::HitTestResult::Miss )
uShifter.reset();
@@ -657,7 +657,7 @@ double DoClipMove( AudacityProject &project, Track *track,
auto desiredT0 = viewInfo.OffsetTimeByPixels( t0, ( right ? 1 : -1 ) );
auto desiredSlideAmount = pShifter->HintOffsetLarger( desiredT0 - t0 );
state.Init( project, *track, hitTestResult, std::move( uShifter ),
state.Init( project, pShifter->GetTrack(), hitTestResult, std::move( uShifter ),
t0, viewInfo, trackList, syncLocked );
auto hSlideAmount = state.DoSlideHorizontal( desiredSlideAmount );