Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-19 14:17:41 +02:00
Code Issues Releases Wiki Activity

Remove TrackList::GetLink

Browse Source
This commit is contained in:
Paul Licameli 2016-12-29 13:12:23 -05:00
parent 9eaa40659e
commit 5fdd9fe05a
4 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Project.cpp
View File

@ -5290,7 +5290,7 @@ void AudacityProject::SetTrackGain(WaveTrack * wt, LWSlider * slider)
float newValue = slider->Get(); float newValue = slider->Get();
// Assume linked track is wave or null // Assume linked track is wave or null
const auto link = static_cast<WaveTrack*>(mTracks->GetLink(wt)); const auto link = static_cast<WaveTrack*>(wt->GetLink());
wt->SetGain(newValue); wt->SetGain(newValue);
if (link) if (link)
link->SetGain(newValue); link->SetGain(newValue);
@ -5306,7 +5306,7 @@ void AudacityProject::SetTrackPan(WaveTrack * wt, LWSlider * slider)
float newValue = slider->Get(); float newValue = slider->Get();
// Assume linked track is wave or null // Assume linked track is wave or null
const auto link = static_cast<WaveTrack*>(mTracks->GetLink(wt)); const auto link = static_cast<WaveTrack*>(wt->GetLink());
wt->SetPan(newValue); wt->SetPan(newValue);
if (link) if (link)
link->SetPan(newValue); link->SetPan(newValue);

9
src/Track.cpp
View File

@ -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 /// Return a track in the list that comes after Track t
Track *TrackList::GetNext(Track * t, bool linked) const Track *TrackList::GetNext(Track * t, bool linked) const
{ {

4
src/Track.h
View File

@ -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. */ /** Select a track, and if it is linked to another track, select it, too. */
void Select(Track * t, bool selected = true); 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; Track *GetPrev(Track * t, bool linked = false) const;
/** Return a track in the list that comes after Track t /** Return a track in the list that comes after Track t

24
src/TrackPanel.cpp
View File

@ -3491,7 +3491,7 @@ void TrackPanel::StartSlide(wxMouseEvent & event)
mCapturedClipArray.push_back(TrackClip(vt, mCapturedClip)); mCapturedClipArray.push_back(TrackClip(vt, mCapturedClip));
// Check for stereo partner // Check for stereo partner
Track *partner = mTracks->GetLink(vt); Track *partner = vt->GetLink();
WaveTrack *wt; WaveTrack *wt;
if (mCapturedClip && if (mCapturedClip &&
// Assume linked track is wave or null // Assume linked track is wave or null
@ -3681,7 +3681,7 @@ void TrackPanel::DoSlide(wxMouseEvent & event)
} }
else { else {
mCapturedTrack->Offset(-mHSlideAmount); mCapturedTrack->Offset(-mHSlideAmount);
Track* link = mTracks->GetLink(mCapturedTrack); Track* link = mCapturedTrack->GetLink();
if (link) if (link)
link->Offset(-mHSlideAmount); link->Offset(-mHSlideAmount);
} }
@ -3931,7 +3931,7 @@ void TrackPanel::DoSlide(wxMouseEvent & event)
// For Shift key down, or // For Shift key down, or
// For non wavetracks, specifically label tracks ... // For non wavetracks, specifically label tracks ...
mCapturedTrack->Offset(mHSlideAmount); mCapturedTrack->Offset(mHSlideAmount);
Track* link = mTracks->GetLink(mCapturedTrack); Track* link = mCapturedTrack->GetLink();
if (link) if (link)
link->Offset(mHSlideAmount); link->Offset(mHSlideAmount);
} }
@ -4209,7 +4209,7 @@ void TrackPanel::HandleWaveTrackVZoom
bool fixedMousePoint) bool fixedMousePoint)
{ {
// Assume linked track is wave or null // Assume linked track is wave or null
const auto partner = static_cast<WaveTrack *>(tracks->GetLink(track)); const auto partner = static_cast<WaveTrack *>(track->GetLink());
int height = track->GetHeight() - (kTopMargin + kBottomMargin); int height = track->GetHeight() - (kTopMargin + kBottomMargin);
int ypos = rect.y + kBorderThickness; int ypos = rect.y + kBorderThickness;
@ -4881,8 +4881,8 @@ void TrackPanel::HandleMinimizing(wxMouseEvent & event)
else if (event.LeftUp()) { else if (event.LeftUp()) {
if (buttonRect.Contains(event.m_x, event.m_y)) { if (buttonRect.Contains(event.m_x, event.m_y)) {
t->SetMinimized(!t->GetMinimized()); t->SetMinimized(!t->GetMinimized());
if (mTracks->GetLink(t)) if (t->GetLink())
mTracks->GetLink(t)->SetMinimized(t->GetMinimized()); t->GetLink()->SetMinimized(t->GetMinimized());
MakeParentRedrawScrollbars(); MakeParentRedrawScrollbars();
MakeParentModifyState(true); MakeParentModifyState(true);
} }
@ -4926,7 +4926,7 @@ void TrackPanel::HandleSliders(wxMouseEvent &event, bool pan)
const auto wt = static_cast<WaveTrack*>(capturedTrack); const auto wt = static_cast<WaveTrack*>(capturedTrack);
// Assume linked track is wave or null // Assume linked track is wave or null
const auto link = static_cast<WaveTrack *>(mTracks->GetLink(wt)); const auto link = static_cast<WaveTrack *>(wt->GetLink());
if (pan) { if (pan) {
#ifdef EXPERIMENTAL_OUTPUT_DISPLAY #ifdef EXPERIMENTAL_OUTPUT_DISPLAY
@ -6265,7 +6265,7 @@ bool TrackPanel::HandleTrackLocationMouseEvent(WaveTrack * track, const wxRect &
{ {
// Assume linked track is wave or null // Assume linked track is wave or null
const auto linked = const auto linked =
static_cast<WaveTrack*>(mTracks->GetLink(track)); static_cast<WaveTrack*>(track->GetLink());
if (linked) { if (linked) {
// Expand the cutline in the opposite channel if it is present. // 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 // Assume linked track is wave or null
const auto linked = const auto linked =
static_cast<WaveTrack*>(mTracks->GetLink(track)); static_cast<WaveTrack*>(track->GetLink());
if (linked) { if (linked) {
// Don't assume correspondence of merge points across channels! // Don't assume correspondence of merge points across channels!
int idx = FindMergeLine(linked, pos); int idx = FindMergeLine(linked, pos);
@ -6315,7 +6315,7 @@ bool TrackPanel::HandleTrackLocationMouseEvent(WaveTrack * track, const wxRect &
track->RemoveCutLine(mCapturedTrackLocation.pos); track->RemoveCutLine(mCapturedTrackLocation.pos);
// Assume linked track is wave or null // Assume linked track is wave or null
const auto linked = const auto linked =
static_cast<WaveTrack*>(mTracks->GetLink(track)); static_cast<WaveTrack*>(track->GetLink());
if (linked) if (linked)
linked->RemoveCutLine(mCapturedTrackLocation.pos); linked->RemoveCutLine(mCapturedTrackLocation.pos);
MakeParentPushState(_("Removed Cut Line"), _("Remove") ); MakeParentPushState(_("Removed Cut Line"), _("Remove") );
@ -8271,7 +8271,7 @@ void TrackPanel::SetRate(WaveTrack * wt, double rate)
{ {
wt->SetRate(rate); wt->SetRate(rate);
// Assume linked track is wave or null // Assume linked track is wave or null
const auto partner = static_cast<WaveTrack*>(mTracks->GetLink(wt)); const auto partner = static_cast<WaveTrack*>(wt->GetLink());
if (partner) if (partner)
partner->SetRate(rate); partner->SetRate(rate);
// Separate conversion of "rate" enables changing the decimals without affecting i18n // 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. wxASSERT(bResult); // TO DO: Actually handle this.
// Assume linked track is wave or null // Assume linked track is wave or null
const auto partner = const auto partner =
static_cast<WaveTrack*>(mTracks->GetLink(mPopupMenuTarget)); static_cast<WaveTrack*>(mPopupMenuTarget->GetLink());
if (partner) if (partner)
{ {
bResult = partner->ConvertToSampleFormat(newFormat); bResult = partner->ConvertToSampleFormat(newFormat);