1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-11 15:16:27 +01:00

Revert "Bug990 (seek key reponsiveness), and, change Scrub UI again, so Ctrl key seeks."

This reverts commit 841bca36ea.
This commit is contained in:
Paul Licameli
2015-05-29 19:45:43 -04:00
parent 841bca36ea
commit 9f2dfbc70b
4 changed files with 13 additions and 38 deletions

View File

@@ -305,7 +305,6 @@ class AUDACITY_DLL_API TrackPanel:public wxPanel {
#endif
#ifdef EXPERIMENTAL_SCRUBBING_BASIC
static bool IsScrubSeekKeyDown();
bool IsScrubbing();
void ToggleScrubbing(
wxCoord xx
@@ -314,7 +313,7 @@ class AUDACITY_DLL_API TrackPanel:public wxPanel {
#endif
);
bool MaybeStartScrubbing(wxMouseEvent &event);
bool ContinueScrubbing(wxCoord position, bool hasFocus, bool maySkip);
bool ContinueScrubbing(wxCoord position, bool maySkip);
bool StopScrubbing();
#endif
@@ -782,8 +781,7 @@ protected:
wxCoord mScrubStartPosition;
double mMaxScrubSpeed;
int mScrubSpeedDisplayCountdown;
bool mScrubHasFocus; // To do: rely on wxWindow::HasFocus() instead, wx verions 2.9.0+
bool mScrubSeekKeypress;
bool mScrubHasFocus;
#endif
#ifdef EXPERIMENTAL_SCRUBBING_SMOOTH_SCROLL