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

Quick-play handle object manages lifetime of SnapManager

Browse Source
This commit is contained in:
Paul Licameli 2018-07-30 15:41:03 -04:00
parent a70e2284b0
commit af17e1ff95
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/widgets/Ruler.cpp
View File

@ -2122,6 +2122,8 @@ public:
QPHandle( AdornedRulerPanel *pParent )
: CommonRulerHandle( pParent )
{}
std::unique_ptr<SnapManager> mSnapManager;
private:
Result Click
@ -2322,7 +2324,6 @@ AdornedRulerPanel::AdornedRulerPanel(AudacityProject* project,
mTracks = project->GetTracks();
mSnapManager = NULL;
mIsSnapped = false;
mIsRecording = false;
@ -2700,7 +2701,6 @@ void AdornedRulerPanel::OnMouseEvents(wxMouseEvent &evt)
wxCoord xx = evt.GetX();
wxCoord mousePosX = xx;
UpdateQuickPlayPos(mousePosX);
HandleSnapping();
// If not looping, restrict selection to end of project
if (zone == StatusChoice::EnteringQP && !evt.ShiftDown()) {
@ -2721,17 +2721,10 @@ void AdornedRulerPanel::OnMouseEvents(wxMouseEvent &evt)
// Handle entering and leaving of the bar, or movement from
// one portion (quick play or scrub) to the other
if (evt.Leaving() || (changeInZone && zone != StatusChoice::EnteringQP)) {
if (evt.Leaving()) {
// Erase the line
DrawBothOverlays();
}
mSnapManager.reset();
if(evt.Leaving())
return;
// else, may detect a scrub click below
if (evt.Leaving()) {
// Erase the line
DrawBothOverlays();
return;
}
else if (evt.Entering() || (changeInZone && zone == StatusChoice::EnteringQP)) {
DrawBothOverlays();
@ -3211,6 +3204,8 @@ void AdornedRulerPanel::UpdateQuickPlayPos(wxCoord &mousePosX)
mousePosX = std::min(mousePosX, tp->GetLeftOffset() + width - 1);
mQuickPlayPosUnsnapped = mQuickPlayPos = Pos2Time(mousePosX);
HandleSnapping();
}
// Pop-up menus
@ -3293,13 +3288,16 @@ void AdornedRulerPanel::DragSelection()
void AdornedRulerPanel::HandleSnapping()
{
if (!mSnapManager) {
mSnapManager = std::make_unique<SnapManager>(mTracks, mViewInfo);
auto handle = mQPCell->mHolder.lock();
if (handle) {
auto &pSnapManager = handle->mSnapManager;
if (! pSnapManager)
pSnapManager = std::make_unique<SnapManager>(mTracks, mViewInfo);
auto results = pSnapManager->Snap(NULL, mQuickPlayPos, false);
mQuickPlayPos = results.outTime;
mIsSnapped = results.Snapped();
}
auto results = mSnapManager->Snap(NULL, mQuickPlayPos, false);
mQuickPlayPos = results.outTime;
mIsSnapped = results.Snapped();
}
void AdornedRulerPanel::OnTimelineToolTips(wxCommandEvent&)

1
src/widgets/Ruler.h
View File

@ -423,7 +423,6 @@ private:
double mQuickPlayPosUnsnapped;
double mQuickPlayPos;
std::unique_ptr<SnapManager> mSnapManager;
bool mIsSnapped;
bool mPlayRegionLock;