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

Fix BSG problems introduced with my recent Snap/TimeConverter changes.

Browse Source
This commit is contained in:
lllucius 2013-10-27 18:17:00 +00:00
parent 45ebbc0491
commit 3cd39fedea
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Snap.cpp
View File

@ -36,15 +36,15 @@ SnapManager::SnapManager(TrackList *tracks, TrackClipArray *exclusions,
// Grab time-snapping prefs (unless otherwise requested)
mSnapToTime = false;
if (GetActiveProject()->GetSnapTo() && !noTimeSnap)
AudacityProject *p = GetActiveProject();
wxASSERT(p);
if (p)
{
// Look up the format string
AudacityProject *p = GetActiveProject();
wxASSERT(p);
if (p) {
mConverter.SetSampleRate(p->GetRate());
if (p->GetSnapTo() && !noTimeSnap) {
mSnapToTime = true;
mConverter.SetFormatName(GetActiveProject()->GetSelectionFormat());
mConverter.SetSampleRate(p->GetRate());
mConverter.SetFormatName(p->GetSelectionFormat());
}
}
@ -107,10 +107,13 @@ SnapManager::SnapManager(TrackList *tracks, TrackClipArray *exclusions,
// Adds to mSnapPoints, filtering by TimeConverter
void SnapManager::CondListAdd(double t, Track *tr)
{
mConverter.SetTimeValue(t);
if (mSnapToTime) {
mConverter.SetTimeValue(t);
}
if (mConverter.GetTimeValue() == t)
if (!mSnapToTime || mConverter.GetTimeValue() == t) {
mSnapPoints->Add(new SnapPoint(t, tr));
}
}
SnapManager::~SnapManager()