From 5fdd9fe05a3fdb1b69a1815739b59782aff02a87 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Thu, 29 Dec 2016 13:12:23 -0500 Subject: [PATCH] Remove TrackList::GetLink --- src/Project.cpp | 4 ++-- src/Track.cpp | 9 --------- src/Track.h | 4 ---- src/TrackPanel.cpp | 24 ++++++++++++------------ 4 files changed, 14 insertions(+), 27 deletions(-) diff --git a/src/Project.cpp b/src/Project.cpp index b49397f49..7517e4df0 100644 --- a/src/Project.cpp +++ b/src/Project.cpp @@ -5290,7 +5290,7 @@ void AudacityProject::SetTrackGain(WaveTrack * wt, LWSlider * slider) float newValue = slider->Get(); // Assume linked track is wave or null - const auto link = static_cast(mTracks->GetLink(wt)); + const auto link = static_cast(wt->GetLink()); wt->SetGain(newValue); if (link) link->SetGain(newValue); @@ -5306,7 +5306,7 @@ void AudacityProject::SetTrackPan(WaveTrack * wt, LWSlider * slider) float newValue = slider->Get(); // Assume linked track is wave or null - const auto link = static_cast(mTracks->GetLink(wt)); + const auto link = static_cast(wt->GetLink()); wt->SetPan(newValue); if (link) link->SetPan(newValue); diff --git a/src/Track.cpp b/src/Track.cpp index 0a2b94c7a..7a5d93a82 100644 --- a/src/Track.cpp +++ b/src/Track.cpp @@ -982,15 +982,6 @@ void TrackList::Select(Track * t, bool selected /* = true */ ) } } -Track *TrackList::GetLink(Track * t) const -{ - if (t) { - return t->GetLink(); - } - - return NULL; -} - /// Return a track in the list that comes after Track t Track *TrackList::GetNext(Track * t, bool linked) const { diff --git a/src/Track.h b/src/Track.h index 06e26c739..cc18b309b 100644 --- a/src/Track.h +++ b/src/Track.h @@ -454,10 +454,6 @@ class TrackList final : public wxEvtHandler, public ListOfTracks /** Select a track, and if it is linked to another track, select it, too. */ void Select(Track * t, bool selected = true); - /** If this track is linked to another track (the track immediately before or - * after it), return its partner. Otherwise return null. */ - Track *GetLink(Track * t) const; - Track *GetPrev(Track * t, bool linked = false) const; /** Return a track in the list that comes after Track t diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp index 85e16c780..1b8fd67df 100644 --- a/src/TrackPanel.cpp +++ b/src/TrackPanel.cpp @@ -3491,7 +3491,7 @@ void TrackPanel::StartSlide(wxMouseEvent & event) mCapturedClipArray.push_back(TrackClip(vt, mCapturedClip)); // Check for stereo partner - Track *partner = mTracks->GetLink(vt); + Track *partner = vt->GetLink(); WaveTrack *wt; if (mCapturedClip && // Assume linked track is wave or null @@ -3681,7 +3681,7 @@ void TrackPanel::DoSlide(wxMouseEvent & event) } else { mCapturedTrack->Offset(-mHSlideAmount); - Track* link = mTracks->GetLink(mCapturedTrack); + Track* link = mCapturedTrack->GetLink(); if (link) link->Offset(-mHSlideAmount); } @@ -3931,7 +3931,7 @@ void TrackPanel::DoSlide(wxMouseEvent & event) // For Shift key down, or // For non wavetracks, specifically label tracks ... mCapturedTrack->Offset(mHSlideAmount); - Track* link = mTracks->GetLink(mCapturedTrack); + Track* link = mCapturedTrack->GetLink(); if (link) link->Offset(mHSlideAmount); } @@ -4209,7 +4209,7 @@ void TrackPanel::HandleWaveTrackVZoom bool fixedMousePoint) { // Assume linked track is wave or null - const auto partner = static_cast(tracks->GetLink(track)); + const auto partner = static_cast(track->GetLink()); int height = track->GetHeight() - (kTopMargin + kBottomMargin); int ypos = rect.y + kBorderThickness; @@ -4881,8 +4881,8 @@ void TrackPanel::HandleMinimizing(wxMouseEvent & event) else if (event.LeftUp()) { if (buttonRect.Contains(event.m_x, event.m_y)) { t->SetMinimized(!t->GetMinimized()); - if (mTracks->GetLink(t)) - mTracks->GetLink(t)->SetMinimized(t->GetMinimized()); + if (t->GetLink()) + t->GetLink()->SetMinimized(t->GetMinimized()); MakeParentRedrawScrollbars(); MakeParentModifyState(true); } @@ -4926,7 +4926,7 @@ void TrackPanel::HandleSliders(wxMouseEvent &event, bool pan) const auto wt = static_cast(capturedTrack); // Assume linked track is wave or null - const auto link = static_cast(mTracks->GetLink(wt)); + const auto link = static_cast(wt->GetLink()); if (pan) { #ifdef EXPERIMENTAL_OUTPUT_DISPLAY @@ -6265,7 +6265,7 @@ bool TrackPanel::HandleTrackLocationMouseEvent(WaveTrack * track, const wxRect & { // Assume linked track is wave or null const auto linked = - static_cast(mTracks->GetLink(track)); + static_cast(track->GetLink()); if (linked) { // Expand the cutline in the opposite channel if it is present. @@ -6294,7 +6294,7 @@ bool TrackPanel::HandleTrackLocationMouseEvent(WaveTrack * track, const wxRect & // Assume linked track is wave or null const auto linked = - static_cast(mTracks->GetLink(track)); + static_cast(track->GetLink()); if (linked) { // Don't assume correspondence of merge points across channels! int idx = FindMergeLine(linked, pos); @@ -6315,7 +6315,7 @@ bool TrackPanel::HandleTrackLocationMouseEvent(WaveTrack * track, const wxRect & track->RemoveCutLine(mCapturedTrackLocation.pos); // Assume linked track is wave or null const auto linked = - static_cast(mTracks->GetLink(track)); + static_cast(track->GetLink()); if (linked) linked->RemoveCutLine(mCapturedTrackLocation.pos); MakeParentPushState(_("Removed Cut Line"), _("Remove") ); @@ -8271,7 +8271,7 @@ void TrackPanel::SetRate(WaveTrack * wt, double rate) { wt->SetRate(rate); // Assume linked track is wave or null - const auto partner = static_cast(mTracks->GetLink(wt)); + const auto partner = static_cast(wt->GetLink()); if (partner) partner->SetRate(rate); // Separate conversion of "rate" enables changing the decimals without affecting i18n @@ -8316,7 +8316,7 @@ void TrackPanel::OnFormatChange(wxCommandEvent & event) wxASSERT(bResult); // TO DO: Actually handle this. // Assume linked track is wave or null const auto partner = - static_cast(mTracks->GetLink(mPopupMenuTarget)); + static_cast(mPopupMenuTarget->GetLink()); if (partner) { bResult = partner->ConvertToSampleFormat(newFormat);