From 1bff08a75a65fd7cda8c4074840df6746d7cf1e6 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Thu, 12 May 2016 01:22:07 -0400 Subject: [PATCH] Make drag-scrub seek, rather than playing at more than unit speed --- src/tracks/ui/Scrubbing.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tracks/ui/Scrubbing.cpp b/src/tracks/ui/Scrubbing.cpp index b096fd967..ee6ccb071 100644 --- a/src/tracks/ui/Scrubbing.cpp +++ b/src/tracks/ui/Scrubbing.cpp @@ -360,7 +360,7 @@ void Scrubber::ContinueScrubbing() const auto lastTime = gAudioIO->GetLastTimeInScrubQueue(); const auto delta = mLastScrubPosition - position.x; const double time = viewInfo.OffsetTimeByPixels(lastTime, delta); - result = gAudioIO->EnqueueScrubByPosition(time, mMaxScrubSpeed, false); + result = gAudioIO->EnqueueScrubByPosition(time, mMaxScrubSpeed, true); mLastScrubPosition = position.x; } else { @@ -667,7 +667,7 @@ Scrubber &ScrubbingOverlay::GetScrubber() bool Scrubber::PollIsSeeking() { - return !mDragging && (mAlwaysSeeking || ::wxGetMouseState().LeftIsDown()); + return mDragging || (mAlwaysSeeking || ::wxGetMouseState().LeftIsDown()); } void Scrubber::DoScrub(bool scroll, bool seek)