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

Bug 1132: Time shift should not snap to starting positions of moving labels

Browse Source
This commit is contained in:
Paul Licameli
2015-08-08 16:10:33 -04:00
parent 2091185b07
commit cfdbc35990
4 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Snap.cpp
View File

@@ -30,6 +30,7 @@ static int CompareSnapPoints(SnapPoint *s1, SnapPoint *s2)
}
SnapManager::SnapManager(TrackList *tracks, TrackClipArray *exclusions,
const std::vector<Track*> *pLabelTrackExclusions,
const ZoomInfo &zoomInfo, int pixelTolerance, bool noTimeSnap)
: mConverter(NumericConverter::TIME)
, mPixelTolerance(std::max(0, pixelTolerance))
@@ -61,9 +62,15 @@ SnapManager::SnapManager(TrackList *tracks, TrackClipArray *exclusions,
mSnapPoints->Add(new SnapPoint(0.0, NULL));
TrackListIterator iter(tracks);
Track *track = iter.First();
while (track) {
for (Track *track = iter.First(); track; track = iter.Next()) {
if (track->GetKind() == Track::Label) {
if (pLabelTrackExclusions) {
const std::vector<Track*>::const_iterator
begin = pLabelTrackExclusions->begin(),
end = pLabelTrackExclusions->end();
if (end != std::find(begin, end, track))
continue;
}
LabelTrack *labelTrack = (LabelTrack *)track;
for(i = 0; i < labelTrack->GetNumLabels(); i++) {
const LabelStruct *label = labelTrack->GetLabel(i);
@@ -100,7 +107,6 @@ SnapManager::SnapManager(TrackList *tracks, TrackClipArray *exclusions,
CondListAdd(track->GetEndTime(), track);
}
#endif
track = iter.Next();
}
}