Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-25 00:30:07 +02:00
Code Issues Releases Wiki Activity

Fix conditional compilation branch

Browse Source
This commit is contained in:
Paul Licameli 2016-05-19 19:31:19 -04:00
parent 3dcf802bdc
commit 8ed93b8147
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tracks/ui/Scrubbing.cpp
View File

@ -20,6 +20,12 @@ Paul Licameli split from TrackPanel.cpp
#include "../../TrackPanelCellIterator.h" #include "../../TrackPanelCellIterator.h"
#include "../../commands/CommandFunctors.h" #include "../../commands/CommandFunctors.h"
#include "../../toolbars/ControlToolBar.h" #include "../../toolbars/ControlToolBar.h"
#undef USE_TRANSCRIPTION_TOOLBAR
#ifdef USE_TRANSCRIPTION_TOOLBAR
#include "../../toolbars/TranscriptionToolBar.h"
#endif
#include "../../widgets/Ruler.h" #include "../../widgets/Ruler.h"
#include <algorithm> #include <algorithm>
@ -297,12 +303,12 @@ bool Scrubber::MaybeStartScrubbing(wxCoord xx)
options.scrubDelay = (ScrubPollInterval_ms / 1000.0); options.scrubDelay = (ScrubPollInterval_ms / 1000.0);
options.scrubStartClockTimeMillis = mScrubStartClockTimeMillis; options.scrubStartClockTimeMillis = mScrubStartClockTimeMillis;
options.minScrubStutter = 0.2; options.minScrubStutter = 0.2;
#if 0 #ifdef USE_TRANSCRIPTION_TOOLBAR
if (!mAlwaysSeeking) { if (!mAlwaysSeeking) {
// 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(); mProject->GetTranscriptionToolBar()->GetPlaySpeed();
} }
#else #else
// That idea seems unpopular... just make it one for move-scrub, // That idea seems unpopular... just make it one for move-scrub,