From 4ee482dbd91f2491e46e43ff1b1b2159e01e7742 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Mon, 25 May 2015 10:12:38 -0400 Subject: [PATCH] Bug973: don't use transcription toolbar setting in scrubbing --- src/TrackPanel.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp index a917725a8..a820c9c86 100755 --- a/src/TrackPanel.cpp +++ b/src/TrackPanel.cpp @@ -217,7 +217,7 @@ is time to refresh some aspect of the screen. #include "toolbars/ControlToolBar.h" #include "toolbars/ToolManager.h" #include "toolbars/ToolsToolBar.h" -#include "toolbars/TranscriptionToolBar.h" +// #include "toolbars/TranscriptionToolBar.h" #include "widgets/ASlider.h" #include "widgets/Ruler.h" @@ -2375,10 +2375,15 @@ bool TrackPanel::MaybeStartScrubbing(wxMouseEvent &event) options.scrubDelay = (kTimerInterval / 1000.0); options.scrubStartClockTimeMillis = mScrubStartClockTimeMillis; options.minScrubStutter = 0.2; +#if 0 // Take the starting speed limit from the transcription toolbar, // but it may be varied during the scrub. mMaxScrubSpeed = options.maxScrubSpeed = p->GetTranscriptionToolBar()->GetPlaySpeed(); +#else + // That idea seems unpopular... just make it one + mMaxScrubSpeed = options.maxScrubSpeed = 1.0; +#endif options.maxScrubTime = mTracks->GetEndTime(); const bool cutPreview = false; const bool backwards = time1 < time0;