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

Pass project to TrackShifter factory, which LabelTrackShifter will need

Browse Source
This commit is contained in:
Paul Licameli
2020-09-19 21:13:45 -04:00
parent 14dc5af223
commit 637ce894c1
5 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/menus/ClipMenus.cpp
View File

@@ -627,10 +627,10 @@ void DoCursorClipBoundary
}
// This function returns the amount moved. Possibly 0.0.
double DoClipMove
( ViewInfo &viewInfo, Track *track,
double DoClipMove( AudacityProject &project, Track *track,
TrackList &trackList, bool syncLocked, bool right )
{
auto &viewInfo = ViewInfo::Get(project);
auto &selectedRegion = viewInfo.selectedRegion;
if (track) {
@@ -642,7 +642,7 @@ double DoClipMove
// Find the first channel that has a clip at time t0
for (auto channel : TrackList::Channels(track) ) {
uShifter = MakeTrackShifter::Call( *track );
uShifter = MakeTrackShifter::Call( *track, project );
if( uShifter->HitTest( t0 ) == TrackShifter::HitTestResult::Miss )
uShifter.reset();
else
@@ -653,7 +653,7 @@ double DoClipMove
return 0.0;
auto pShifter = uShifter.get();
state.Init( *track, std::move( uShifter ),
state.Init( project, *track, std::move( uShifter ),
t0, viewInfo, trackList, syncLocked );
auto desiredT0 = viewInfo.OffsetTimeByPixels( t0, ( right ? 1 : -1 ) );
@@ -700,7 +700,7 @@ void DoClipLeftOrRight
auto &tracks = TrackList::Get( project );
auto isSyncLocked = settings.IsSyncLocked();
auto amount = DoClipMove( viewInfo, trackFocus.Get(),
auto amount = DoClipMove( project, trackFocus.Get(),
tracks, isSyncLocked, right );
window.ScrollIntoView(selectedRegion.t0());