Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-20 15:41:18 +01:00
Code Issues Releases Wiki Activity

Scrubbing at high mag, play head won't stray left of track edge

Browse Source
This commit is contained in:
Paul Licameli
2018-09-09 13:10:01 -04:00
parent 03def8dbaf
commit 52ad43daac
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/tracks/ui/PlayIndicatorOverlay.cpp
View File

@@ -166,9 +166,13 @@ void PlayIndicatorOverlay::OnTimer(wxCommandEvent &event)
// Calculate the horizontal position of the indicator // Calculate the horizontal position of the indicator
const double playPos = viewInfo.mRecentStreamTime; const double playPos = viewInfo.mRecentStreamTime;
using Mode = AudacityProject::PlaybackScroller::Mode;
const Mode mode = mProject->GetPlaybackScroller().GetMode();
const bool pinned = ( mode == Mode::Pinned || mode == Mode::Right );
// Use a small tolerance to avoid flicker of play head pinned all the way // Use a small tolerance to avoid flicker of play head pinned all the way
// left or right // left or right
const auto tolerance = 1.5 * kTimerInterval / 1000.0; const auto tolerance = pinned ? 1.5 * kTimerInterval / 1000.0 : 0;
bool onScreen = playPos >= 0.0 && bool onScreen = playPos >= 0.0 &&
between_incexc(viewInfo.h - tolerance, between_incexc(viewInfo.h - tolerance,
playPos, playPos,
@@ -182,9 +186,6 @@ void PlayIndicatorOverlay::OnTimer(wxCommandEvent &event)
playPos >= 0 && !onScreen ) { playPos >= 0 && !onScreen ) {
// msmeyer: But only if not playing looped or in one-second mode // msmeyer: But only if not playing looped or in one-second mode
// PRL: and not scrolling with play/record head fixed // PRL: and not scrolling with play/record head fixed
using Mode = AudacityProject::PlaybackScroller::Mode;
const Mode mode = mProject->GetPlaybackScroller().GetMode();
const bool pinned = ( mode == Mode::Pinned || mode == Mode::Right );
if (!pinned && if (!pinned &&
mProject->mLastPlayMode != PlayMode::loopedPlay && mProject->mLastPlayMode != PlayMode::loopedPlay &&
mProject->mLastPlayMode != PlayMode::oneSecondPlay && mProject->mLastPlayMode != PlayMode::oneSecondPlay &&