1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-02 16:49:41 +02:00

Merge: Bug969: Just disable pause during scrub. It does not make sense.

This commit is contained in:
Paul Licameli 2015-05-26 13:01:17 -04:00
commit 82c99a109e
2 changed files with 9 additions and 0 deletions

View File

@ -168,6 +168,8 @@ class AUDACITY_DLL_API AudioIO {
void SeekStream(double seconds) { mSeek = seconds; }
#ifdef EXPERIMENTAL_SCRUBBING_SUPPORT
bool IsScrubbing() { return IsBusy() && mScrubQueue != 0; }
static double GetMaxScrubSpeed() { return 32.0; } // Is five octaves enough for your amusement?
static double GetMinScrubSpeed() { return 0.01; }
/** \brief enqueue a new end time, using the last end as the new start,

View File

@ -977,6 +977,13 @@ void ControlToolBar::OnRecord(wxCommandEvent &evt)
void ControlToolBar::OnPause(wxCommandEvent & WXUNUSED(evt))
{
#ifdef EXPERIMENTAL_SCRUBBING_SUPPORT
if (gAudioIO->IsScrubbing())
// Pausing does not make sense. Force the button
// to pop up below.
mPaused = true;
#endif
if(mPaused)
{
mPause->PopUp();