Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-05 23:19:06 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AudioIO.h
View File

@ -168,6 +168,8 @@ class AUDACITY_DLL_API AudioIO {
void SeekStream(double seconds) { mSeek = seconds; } void SeekStream(double seconds) { mSeek = seconds; }
#ifdef EXPERIMENTAL_SCRUBBING_SUPPORT #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 GetMaxScrubSpeed() { return 32.0; } // Is five octaves enough for your amusement?
static double GetMinScrubSpeed() { return 0.01; } static double GetMinScrubSpeed() { return 0.01; }
/** \brief enqueue a new end time, using the last end as the new start, /** \brief enqueue a new end time, using the last end as the new start,

7
src/toolbars/ControlToolBar.cpp
View File

@ -977,6 +977,13 @@ void ControlToolBar::OnRecord(wxCommandEvent &evt)
void ControlToolBar::OnPause(wxCommandEvent & WXUNUSED(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) if(mPaused)
{ {
mPause->PopUp(); mPause->PopUp();