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

Envelope::Paste takes a time tolerance argument

Browse Source
This commit is contained in:
Paul Licameli 2017-05-05 20:43:32 -04:00
parent 02fe963d23
commit 58e7a94264
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Envelope.cpp
View File

@ -734,7 +734,7 @@ void Envelope::CollapseRegion( double t0, double t1, double sampleDur )
// envelope point applies to the first sample, but the t=tracklen
// envelope point applies one-past the last actual sample.
// Rather than going to a .5-offset-index, we special case the framing.
void Envelope::Paste(double t0, const Envelope *e)
void Envelope::Paste(double t0, const Envelope *e, double sampleDur)
// NOFAIL-GUARANTEE
{
const bool wasEmpty = (this->mEnv.size() == 0);

6
src/Envelope.h
View File

@ -125,7 +125,11 @@ public:
// sampleDur determines when the endpoint of the collapse is near enough
// to an endpoint of the domain, that an extra control point is not needed.
void CollapseRegion(double t0, double t1, double sampleDur);
void Paste(double t0, const Envelope *e);
// Envelope has no notion of rate and control point times are not quantized;
// but a tolerance is needed in the Paste routine, and better to inform it
// of an appropriate number, than use hidden arbitrary constants.
void Paste(double t0, const Envelope *e, double sampleDur);
void InsertSpace(double t0, double tlen);
void RemoveUnneededPoints(double time = -1, double tolerence = 0.001);

4
src/TimeTrack.cpp
View File

@ -122,7 +122,9 @@ void TimeTrack::Paste(double t, const Track * src)
// THROW_INCONSISTENCY_EXCEPTION; // ?
return;
mEnvelope->Paste(t, static_cast<const TimeTrack*>(src)->mEnvelope.get());
auto sampleTime = 1.0 / GetActiveProject()->GetRate();
mEnvelope->Paste
(t, static_cast<const TimeTrack*>(src)->mEnvelope.get(), sampleTime);
}
void TimeTrack::Silence(double t0, double t1)

4
src/WaveClip.cpp
View File

@ -1600,7 +1600,9 @@ void WaveClip::Paste(double t0, const WaveClip* other)
// Assume NOFAIL-GUARANTEE in the remaining
MarkChanged();
mEnvelope->Paste(s0.as_double()/mRate + mOffset, pastedClip->mEnvelope.get());
auto sampleTime = 1.0 / GetRate();
mEnvelope->Paste
(s0.as_double()/mRate + mOffset, pastedClip->mEnvelope.get(), sampleTime);
mEnvelope->RemoveUnneededPoints();
OffsetCutLines(t0, pastedClip->GetEndTime() - pastedClip->GetStartTime());