Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-04-04 21:37:36 +02:00
Code Issues Releases Wiki Activity

Some comments to avoid further confusions using WaveTrack::Get().

Browse Source
This commit is contained in:
Paul Licameli
2020-03-21 15:45:50 -04:00
parent 7ae5c65580
commit 7aa2667c33
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/WaveTrack.cpp
View File

@@ -1858,7 +1858,7 @@ float WaveTrack::GetRMS(double t0, double t1, bool mayThrow) const
bool WaveTrack::Get(samplePtr buffer, sampleFormat format,
sampleCount start, size_t len, fillFormat fill,
bool mayThrow, sampleCount * pNumCopied) const
bool mayThrow, sampleCount * pNumWithinClips) const
{
// Simple optimization: When this buffer is completely contained within one clip,
// don't clear anything (because we won't have to). Otherwise, just clear
@@ -1893,6 +1893,7 @@ bool WaveTrack::Get(samplePtr buffer, sampleFormat format,
}
}
// Iterate the clips. They are not necessarily sorted by time.
for (const auto &clip: mClips)
{
auto clipStart = clip->GetStartSample();
@@ -1932,8 +1933,8 @@ bool WaveTrack::Get(samplePtr buffer, sampleFormat format,
samplesCopied += samplesToCopy;
}
}
if( pNumCopied )
*pNumCopied = samplesCopied;
if( pNumWithinClips )
*pNumWithinClips = samplesCopied;
return result;
}