Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-14 17:14:07 +01:00
Code Issues Releases Wiki Activity

Scrub during play stops play, repositions play head

Browse Source
This commit is contained in:
Paul Licameli
2016-05-06 12:38:41 -04:00
parent 66454b7e4c
commit c5d42377b7
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/tracks/ui/Scrubbing.cpp
View File

@@ -203,19 +203,26 @@ void Scrubber::MarkScrubStart(
SetScrollScrubbing (smoothScrolling); SetScrollScrubbing (smoothScrolling);
#endif #endif
mAlwaysSeeking = alwaysSeeking; mAlwaysSeeking = alwaysSeeking;
mScrubStartPosition = xx;
mScrubStartClockTimeMillis = ::wxGetLocalTimeMillis();
ControlToolBar * const ctb = mProject->GetControlToolBar(); ControlToolBar * const ctb = mProject->GetControlToolBar();
// Stop any play in progress
ctb->StopPlaying();
// Usually the timer handler of TrackPanel does this, but we do this now,
// so that same timer does not StopPlaying() again after this function and destroy
// scrubber state
mProject->SetAudioIOToken(0);
ctb->SetPlay(true, ControlToolBar::PlayAppearance::Scrub); ctb->SetPlay(true, ControlToolBar::PlayAppearance::Scrub);
if(gAudioIO->IsPaused())
ctb->Pause(); // un-pause
// This disables the pause button. // This disables the pause button.
ctb->EnableDisableButtons(); ctb->EnableDisableButtons();
ctb->UpdateStatusBar(mProject); ctb->UpdateStatusBar(mProject);
mScrubStartPosition = xx;
mScrubStartClockTimeMillis = ::wxGetLocalTimeMillis();
CheckMenuItem(); CheckMenuItem();
} }