1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-26 17:18:41 +02:00

Bug973: don't use transcription toolbar setting in scrubbing

This commit is contained in:
Paul Licameli 2015-05-25 10:12:38 -04:00
parent 0615ff47ae
commit 4ee482dbd9

View File

@ -217,7 +217,7 @@ is time to refresh some aspect of the screen.
#include "toolbars/ControlToolBar.h" #include "toolbars/ControlToolBar.h"
#include "toolbars/ToolManager.h" #include "toolbars/ToolManager.h"
#include "toolbars/ToolsToolBar.h" #include "toolbars/ToolsToolBar.h"
#include "toolbars/TranscriptionToolBar.h" // #include "toolbars/TranscriptionToolBar.h"
#include "widgets/ASlider.h" #include "widgets/ASlider.h"
#include "widgets/Ruler.h" #include "widgets/Ruler.h"
@ -2375,10 +2375,15 @@ bool TrackPanel::MaybeStartScrubbing(wxMouseEvent &event)
options.scrubDelay = (kTimerInterval / 1000.0); options.scrubDelay = (kTimerInterval / 1000.0);
options.scrubStartClockTimeMillis = mScrubStartClockTimeMillis; options.scrubStartClockTimeMillis = mScrubStartClockTimeMillis;
options.minScrubStutter = 0.2; options.minScrubStutter = 0.2;
#if 0
// Take the starting speed limit from the transcription toolbar, // Take the starting speed limit from the transcription toolbar,
// but it may be varied during the scrub. // but it may be varied during the scrub.
mMaxScrubSpeed = options.maxScrubSpeed = mMaxScrubSpeed = options.maxScrubSpeed =
p->GetTranscriptionToolBar()->GetPlaySpeed(); p->GetTranscriptionToolBar()->GetPlaySpeed();
#else
// That idea seems unpopular... just make it one
mMaxScrubSpeed = options.maxScrubSpeed = 1.0;
#endif
options.maxScrubTime = mTracks->GetEndTime(); options.maxScrubTime = mTracks->GetEndTime();
const bool cutPreview = false; const bool cutPreview = false;
const bool backwards = time1 < time0; const bool backwards = time1 < time0;