Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-04 22:29:27 +02:00
Code Issues Releases Wiki Activity

Bug 2288 - Audio clips may overlap

Browse Source
This commit is contained in:
James Crook 2020-03-02 18:07:34 +00:00
parent 91503a91f1
commit e5dc8928dc
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/WaveClip.cpp
View File

@ -451,10 +451,15 @@ sampleCount WaveClip::GetNumSamples() const
return mSequence->GetNumSamples();
}
// Bug 2288 allowed overlapping clips.
// This was a classic fencepost error.
// We are within the clip if start < t <= end.
// Note that BeforeClip and AfterClip must be consistent
// with this definition.
bool WaveClip::WithinClip(double t) const
{
auto ts = (sampleCount)floor(t * mRate + 0.5);
return ts > GetStartSample() && ts < GetEndSample() + mAppendBufferLen;
return ts > GetStartSample() && ts <= GetEndSample() + mAppendBufferLen;
}
bool WaveClip::BeforeClip(double t) const
@ -466,7 +471,7 @@ bool WaveClip::BeforeClip(double t) const
bool WaveClip::AfterClip(double t) const
{
auto ts = (sampleCount)floor(t * mRate + 0.5);
return ts >= GetEndSample() + mAppendBufferLen;
return ts > GetEndSample() + mAppendBufferLen;
}
///Delete the wave cache - force redraw. Thread-safe