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 647] Snap-To clicks find nearest snap point, not nearest previous.

Browse Source 
Convert SnapTo from on/off to a choice of off/nearest/prior.
This commit is contained in:
lllucius
2013-11-01 14:13:39 +00:00
parent 05302d7483
commit ce00d5b507
7 changed files with 95 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/Snap.cpp
View File

@@ -255,7 +255,7 @@ bool SnapManager::Snap(Track *currentTrack,
}
else {
// Snap time to the grid
mConverter.ValueToControls(t, SNAP_TO_NEAREST);
mConverter.ValueToControls(t, GetActiveProject()->GetSnapTo() == SNAP_NEAREST);
mConverter.ControlsToValue();
*out_t = mConverter.GetTimeValue();
*snappedTime = true;
@@ -264,3 +264,50 @@ bool SnapManager::Snap(Track *currentTrack,
return *snappedPoint || *snappedTime;
}
/* static */ wxArrayString SnapManager::GetSnapLabels()
{
wxArrayString labels;
labels.Add(_("Off"));
labels.Add(_("Nearest"));
labels.Add(_("Prior"));
return labels;
}
/* static */ wxArrayString SnapManager::GetSnapValues()
{
wxArrayString values;
values.Add(wxT("Off"));
values.Add(wxT("Nearest"));
values.Add(wxT("Prior"));
return values;
}
/* static */ const wxString & SnapManager::GetSnapValue(int index)
{
wxArrayString values = SnapManager::GetSnapValues();
if (index >= 0 && index < (int) values.GetCount())
{
return values[index];
}
return values[SNAP_OFF];
}
/* static */ int SnapManager::GetSnapIndex(const wxString & value)
{
wxArrayString values = SnapManager::GetSnapValues();
int index = values.Index(value);
if (index != wxNOT_FOUND)
{
return index;
}
return SNAP_OFF;
}