Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-04 17:49:45 +02:00
Code Issues Releases Wiki Activity

WaveClip::GetCutLines() returns a reference

Browse Source
This commit is contained in:
Paul Licameli 2016-08-11 18:56:32 -04:00
parent bd57f6392f
commit afc22caf5a
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/WaveClip.h
View File

@ -318,7 +318,7 @@ public:
bool InsertSilence(double t, double len);
/// Get access to cut lines list
WaveClipList* GetCutLines() { return &mCutLines; }
WaveClipList &GetCutLines() { return mCutLines; }
/** Find cut line at (approximately) this position. Returns true and fills
* in cutLineStart and cutLineEnd (if specified) if a cut line at this

13
src/WaveTrack.cpp
View File

@ -851,9 +851,9 @@ bool WaveTrack::ClearAndPaste(double t0, // Start of time to clear
}
// Search for cut lines
const auto &cutlines = clip->GetCutLines();
auto &cutlines = clip->GetCutLines();
// May erase from cutlines, so don't use range-for
for (auto it = cutlines->begin(); it != cutlines->end(); ) {
for (auto it = cutlines.begin(); it != cutlines.end(); ) {
WaveClip *cut = *it;
double cs = LongSamplesToTime(TimeToLongSamples(clip->GetOffset() +
cut->GetOffset()));
@ -862,7 +862,7 @@ bool WaveTrack::ClearAndPaste(double t0, // Start of time to clear
if (cs >= t0 && cs <= t1) {
// Remove cut point from this clips cutlines array, otherwise
// it will not be deleted when HandleClear() is called.
it = cutlines->erase(it);
it = cutlines.erase(it);
// Remember the absolute offset and add to our cuts array.
cut->SetOffset(cs);
@ -954,7 +954,7 @@ bool WaveTrack::ClearAndPaste(double t0, // Start of time to clear
// this clips cutlines.
if (cs >= st && cs <= et) {
cut->SetOffset(warper->Warp(cs) - st);
clip->GetCutLines()->push_back(cut);
clip->GetCutLines().push_back(cut);
cuts.RemoveAt(i);
i--;
}
@ -2427,7 +2427,7 @@ void WaveTrack::UpdateLocationsCache() const
{
WaveClip* clip = clips.Item(i);
num += clip->GetCutLines()->size();
num += clip->GetCutLines().size();
if (i > 0 && fabs(clips.Item(i - 1)->GetEndTime() -
clip->GetStartTime()) < WAVETRACK_MERGE_POINT_TOLERANCE)
@ -2447,8 +2447,7 @@ void WaveTrack::UpdateLocationsCache() const
{
WaveClip* clip = clips.Item(i);
WaveClipList* cutlines = clip->GetCutLines();
for (const auto &cc: *cutlines)
for (const auto &cc : clip->GetCutLines())
{
// Add cut line expander point
mDisplayLocationsCache.push_back(WaveTrackLocation{