Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-18 09:00:07 +02:00
Code Issues Releases Wiki Activity

Rename SyncLockTracksIterator::First to StartWith to be consistent

Browse Source
This commit is contained in:
Paul Licameli 2016-02-23 14:06:36 -05:00
parent a9028e1184
commit c98b090182
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Track.cpp
View File

@ -283,7 +283,7 @@ bool Track::IsSyncLockSelected() const
return false; return false;
SyncLockedTracksIterator git(mList); SyncLockedTracksIterator git(mList);
Track *t = git.First(const_cast<Track*>(this)); Track *t = git.StartWith(const_cast<Track*>(this));
if (!t) { if (!t) {
// Not in a sync-locked group. // Not in a sync-locked group.
@ -578,7 +578,7 @@ SyncLockedTracksIterator::SyncLockedTracksIterator(TrackList * val)
{ {
} }
Track *SyncLockedTracksIterator::First(Track * member) Track *SyncLockedTracksIterator::StartWith(Track * member)
{ {
Track *t = NULL; Track *t = NULL;

8
src/Track.h
View File

@ -322,10 +322,10 @@ class AUDACITY_DLL_API SyncLockedTracksIterator : public TrackListIterator
virtual ~SyncLockedTracksIterator() {} virtual ~SyncLockedTracksIterator() {}
// Iterate functions // Iterate functions
Track *First(Track *member); Track *StartWith(Track *member) override;
Track *Next(bool skiplinked = false); Track *Next(bool skiplinked = false) override;
Track *Prev(bool skiplinked = false); Track *Prev(bool skiplinked = false) override;
Track *Last(bool skiplinked = false); Track *Last(bool skiplinked = false) override;
private: private:
bool mInLabelSection; bool mInLabelSection;

6
src/TrackPanel.cpp
View File

@ -942,7 +942,7 @@ void TrackPanel::SelectTrackLength(Track *t)
{ {
AudacityProject *p = GetActiveProject(); AudacityProject *p = GetActiveProject();
SyncLockedTracksIterator it(mTracks); SyncLockedTracksIterator it(mTracks);
Track *t1 = it.First(t); Track *t1 = it.StartWith(t);
double minOffset = t->GetOffset(); double minOffset = t->GetOffset();
double maxEnd = t->GetEndTime(); double maxEnd = t->GetEndTime();
@ -3968,7 +3968,7 @@ void TrackPanel::StartSlide(wxMouseEvent & event)
if (mCapturedClipArray[i].clip) { if (mCapturedClipArray[i].clip) {
// Iterate over sync-lock group tracks. // Iterate over sync-lock group tracks.
SyncLockedTracksIterator git(mTracks); SyncLockedTracksIterator git(mTracks);
for ( Track *t = git.First(mCapturedClipArray[i].track); for (Track *t = git.StartWith(mCapturedClipArray[i].track);
t; t = git.Next() ) t; t = git.Next() )
{ {
AddClipsToCaptured(t, AddClipsToCaptured(t,
@ -3984,7 +3984,7 @@ void TrackPanel::StartSlide(wxMouseEvent & event)
if (nt->GetKind() == Track::Note) { if (nt->GetKind() == Track::Note) {
// Iterate over sync-lock group tracks. // Iterate over sync-lock group tracks.
SyncLockedTracksIterator git(mTracks); SyncLockedTracksIterator git(mTracks);
for (Track *t = git.First(nt); t; t = git.Next()) for (Track *t = git.StartWith(nt); t; t = git.Next())
{ {
AddClipsToCaptured(t, nt->GetStartTime(), nt->GetEndTime()); AddClipsToCaptured(t, nt->GetStartTime(), nt->GetEndTime());
if (t->GetKind() != Track::Wave) if (t->GetKind() != Track::Wave)

4
src/effects/TruncSilence.cpp
View File

@ -279,7 +279,7 @@ bool EffectTruncSilence::ProcessIndependently()
if (syncLock) { if (syncLock) {
Track *const link = track->GetLink(); Track *const link = track->GetLink();
SyncLockedTracksIterator syncIter(mTracks); SyncLockedTracksIterator syncIter(mTracks);
for (Track *track2 = syncIter.First(track); track2; track2 = syncIter.Next()) { for (Track *track2 = syncIter.StartWith(track); track2; track2 = syncIter.Next()) {
if (track2->GetKind() == Track::Wave && if (track2->GetKind() == Track::Wave &&
!(track2 == track || track2 == link) && !(track2 == track || track2 == link) &&
track2->GetSelected()) { track2->GetSelected()) {
@ -320,7 +320,7 @@ bool EffectTruncSilence::ProcessIndependently()
Track *groupFirst, *groupLast; Track *groupFirst, *groupLast;
if (syncLock) { if (syncLock) {
SyncLockedTracksIterator syncIter(mOutputTracks); SyncLockedTracksIterator syncIter(mOutputTracks);
groupFirst = syncIter.First(track); groupFirst = syncIter.StartWith(track);
groupLast = syncIter.Last(); groupLast = syncIter.Last();
} }
else { else {

4
src/effects/nyquist/Nyquist.cpp
View File

@ -616,7 +616,7 @@ bool NyquistEffect::Process()
// Check whether we're in the same group as the last selected track // Check whether we're in the same group as the last selected track
SyncLockedTracksIterator gIter(mOutputTracks); SyncLockedTracksIterator gIter(mOutputTracks);
Track *gt = gIter.First(mCurTrack[0]); Track *gt = gIter.StartWith(mCurTrack[0]);
mFirstInGroup = !gtLast || (gtLast != gt); mFirstInGroup = !gtLast || (gtLast != gt);
gtLast = gt; gtLast = gt;
@ -1228,7 +1228,7 @@ bool NyquistEffect::ProcessOne()
if (mFirstInGroup) { if (mFirstInGroup) {
SyncLockedTracksIterator git(mOutputTracks); SyncLockedTracksIterator git(mOutputTracks);
Track *t; Track *t;
for (t = git.First(mCurTrack[i]); t; t = git.Next()) for (t = git.StartWith(mCurTrack[i]); t; t = git.Next())
{ {
if (!t->GetSelected() && t->IsSyncLockSelected()) { if (!t->GetSelected() && t->IsSyncLockSelected()) {
t->SyncLockAdjust(mT1, mT0 + out->GetEndTime()); t->SyncLockAdjust(mT1, mT0 + out->GetEndTime());