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

Fix bug reported by Steve, applying Nyquist effects...

Browse Source 
... To short selections (under 1/100 second), at the start of the second of
two separated clips, in a project with a high sampling rate of 192000.

Symptom was that the audio moved so it was pasted to the end of the first clip.

Other uses of the constant WAVETRACK_MERGE_POINT_TOLERANCE should be
reviewed too but this is a conservative fix made close to release time.
This commit is contained in:
Paul Licameli 2016-12-04 14:16:03 -05:00
parent ba263d0779
commit 51202bffb0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/WaveTrack.cpp
View File

@ -873,6 +873,8 @@ bool WaveTrack::ClearAndPaste(double t0, // Start of time to clear
}
}
const auto tolerance = 2.0 / GetRate();
// Now, clear the selection
if (HandleClear(t0, t1, false, false)) {
@ -894,7 +896,7 @@ bool WaveTrack::ClearAndPaste(double t0, // Start of time to clear
for (const auto clip : clips) {
// Merge this clip and the previous clip if the end time
// falls within it and this isn't the first clip in the track.
if (fabs(t1 - clip->GetStartTime()) < WAVETRACK_MERGE_POINT_TOLERANCE) {
if (fabs(t1 - clip->GetStartTime()) < tolerance) {
if (prev) {
bool bResult = MergeClips(GetClipIndex(prev), GetClipIndex(clip));
wxASSERT(bResult); // TO DO: Actually handle this.
@ -920,7 +922,7 @@ bool WaveTrack::ClearAndPaste(double t0, // Start of time to clear
wxUnusedVar(bResult);
break;
}
if (fabs(t0 - clip->GetEndTime()) < WAVETRACK_MERGE_POINT_TOLERANCE)
if (fabs(t0 - clip->GetEndTime()) < tolerance)
// Merge this clip and the next clip if the start time
// falls within it and this isn't the last clip in the track.
prev = clip;