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

Fix problem with linked label tracks and truncate silence

Browse Source
This commit is contained in:
BusinessmanProgrammerSteve 2010-04-12 15:29:53 +00:00
parent b3d6457ef5
commit fc1617ff2f
2 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/LabelTrack.cpp
View File

@ -2152,7 +2152,7 @@ bool LabelTrack::Save(wxTextFile * out, bool overwrite)
bool LabelTrack::Cut(double t0, double t1, Track **dest)
{
if (!SplitCut(t0, t1, dest))
if (!Copy(t0, t1, dest))
return false;
if (!Clear(t0, t1))
return false;
@ -2162,27 +2162,12 @@ bool LabelTrack::Cut(double t0, double t1, Track **dest)
bool LabelTrack::SplitCut(double t0, double t1, Track ** dest)
{
*dest = new LabelTrack(GetDirManager());
int len = mLabels.Count();
// SplitCut() == Copy() + SplitDelete()
for (int i = 0; i < len; i++) {
if (t0 <= mLabels[i]->t && mLabels[i]->t <= t1) {
mLabels[i]->t -= t0;
mLabels[i]->t1 -= t0;
((LabelTrack *) (*dest))->mLabels.Add(mLabels[i]);
//Don't use DeleteLabel() since we've only moved it.
mLabels.RemoveAt(i);
// JC: ALWAYS unselect, since RemoveAt renumbers labels.
mSelIndex=-1;
len--;
i--;
}
else if (mLabels[i]->t > t1) {
mLabels[i]->t -= (t1 - t0);
mLabels[i]->t1 -= (t1 - t0);
}
}
((LabelTrack *) (*dest))->mClipLen = (t1 - t0);
if (!Copy(t0, t1, dest))
return false;
if (!SplitDelete(t0, t1))
return false;
return true;
}

2
src/effects/TruncSilence.cpp
View File

@ -680,7 +680,7 @@ bool EffectTruncSilence::Process()
// Non-wave tracks: just do a sync adjust
double cutStart = (r->start + r->end - cutLen) / 2;
double cutEnd = cutStart + cutLen;
t->SyncAdjust(cutStart, cutEnd);
t->SyncAdjust(cutEnd, cutStart);
}
}
++whichReg;