Reordered SnapManager ctor arguments, added AudacityProject &

src/AdornedRulerPanel.cpp

@@ -1900,7 +1900,8 @@ void AdornedRulerPanel::HandleSnapping()
    if (handle) {
       auto &pSnapManager = handle->mSnapManager;
       if (! pSnapManager)
-         pSnapManager = std::make_unique<SnapManager>(mTracks, mViewInfo);
+         pSnapManager =
+            std::make_unique<SnapManager>(*mProject, *mTracks, *mViewInfo);
       
       auto results = pSnapManager->Snap(NULL, mQuickPlayPos, false);
       mQuickPlayPos = results.outTime;

src/Snap.cpp

@@ -39,22 +39,23 @@ TrackClip::~TrackClip()
 
 }
 
-SnapManager::SnapManager(const TrackList *tracks,
+SnapManager::SnapManager(const AudacityProject &project,
-                         const ZoomInfo *zoomInfo,
+                         const TrackList &tracks,
-                         const TrackClipArray *clipExclusions,
+                         const ZoomInfo &zoomInfo,
-                         const TrackArray *trackExclusions,
                          bool noTimeSnap,
-                         int pixelTolerance)
+                         int pixelTolerance,
+                         const TrackClipArray *clipExclusions,
+                         const TrackArray *trackExclusions)
 :  mConverter(NumericConverter::TIME)
 {
-   mTracks = tracks;
+   mTracks = &tracks;
-   mZoomInfo = zoomInfo;
+   mZoomInfo = &zoomInfo;
    mClipExclusions = clipExclusions;
    mTrackExclusions = trackExclusions;
    mPixelTolerance = pixelTolerance;
    mNoTimeSnap = noTimeSnap;
 
-   mProject = tracks->GetOwner();
+   mProject = &project;
    wxASSERT(mProject);
 
    mSnapTo = 0;

src/Snap.h

@@ -77,12 +77,13 @@ struct SnapResults {
 class SnapManager
 {
 public:
-   SnapManager(const TrackList *tracks,
+   SnapManager(const AudacityProject &project,
-               const ZoomInfo *zoomInfo,
+               const TrackList &tracks,
-               const TrackClipArray *clipExclusions = NULL,
+               const ZoomInfo &zoomInfo,
-               const TrackArray *trackExclusions = NULL,
                bool noTimeSnap = false,
-               int pixelTolerance = kPixelTolerance);
+               int pixelTolerance = kPixelTolerance,
+               const TrackClipArray *clipExclusions = NULL,
+               const TrackArray *trackExclusions = NULL);
    ~SnapManager();
 
    // The track may be NULL.

src/tracks/ui/SelectHandle.cpp

@@ -432,7 +432,8 @@ SelectHandle::SelectHandle
   const TrackList &trackList,
   const TrackPanelMouseState &st, const ViewInfo &viewInfo )
    : mpView{ pTrackView }
-   , mSnapManager{ std::make_shared<SnapManager>(&trackList, &viewInfo) }
+   , mSnapManager{ std::make_shared<SnapManager>(
+      *trackList.GetOwner(), trackList, viewInfo) }
 {
    const wxMouseState &state = st.state;
    mRect = st.rect;

src/tracks/ui/TimeShiftHandle.cpp

@@ -414,11 +414,13 @@ UIHandle::Result TimeShiftHandle::Click
    mSlideUpDownOnly = event.CmdDown() && !multiToolModeActive;
    mRect = rect;
    mClipMoveState.mMouseClickX = event.m_x;
-   mSnapManager = std::make_shared<SnapManager>(&trackList,
+   mSnapManager =
-                                  &viewInfo,
+   std::make_shared<SnapManager>(*trackList.GetOwner(), trackList,
-                                  &mClipMoveState.capturedClipArray,
+          viewInfo,
-                                  &mClipMoveState.trackExclusions,
+          true, // don't snap to time
-                                  true); // don't snap to time
+          kPixelTolerance,
+          &mClipMoveState.capturedClipArray,
+          &mClipMoveState.trackExclusions);
    mClipMoveState.snapLeft = -1;
    mClipMoveState.snapRight = -1;
    mSnapPreferRightEdge =