Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-15 15:11:12 +02:00
Code Issues Releases Wiki Activity

Remove "skiplinked" argument of old track iterators

Browse Source
This commit is contained in:
Paul Licameli
2016-11-03 22:10:57 -04:00
parent d19695022a
commit 89748cbe3c
7 changed files with 79 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/tracks/ui/TimeShiftHandle.cpp
View File

@@ -153,26 +153,23 @@ namespace
WaveTrack *NthAudioTrack(TrackList &list, int nn)
{
if (nn >= 0) {
TrackListOfKindIterator iter(Track::Wave, &list);
Track *pTrack = iter.First();
while (pTrack && nn--)
pTrack = iter.Next(true);
return static_cast<WaveTrack*>(pTrack);
for ( auto pTrack : list.Leaders< WaveTrack >() )
if (nn -- == 0)
return pTrack;
}
return NULL;
}
// Don't count right channels.
int TrackPosition(TrackList &list, Track *pFindTrack)
int TrackPosition(TrackList &list, const Track *pFindTrack)
{
Track *const partner = pFindTrack->GetLink();
TrackListOfKindIterator iter(Track::Wave, &list);
pFindTrack = *list.FindLeader(pFindTrack);
int nn = 0;
for (Track *pTrack = iter.First(); pTrack; pTrack = iter.Next(true), ++nn) {
if (pTrack == pFindTrack ||
pTrack == partner)
for ( auto pTrack : list.Leaders< const WaveTrack >() ) {
if (pTrack == pFindTrack)
return nn;
++nn;
}
return -1;
}