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

Revert "Disable scrubbing when pause button is down."

Browse Source 
This reverts commit 97fdce5f85e884cbe6f161963789694015cdf328.
This commit is contained in:
Paul Licameli 2016-05-06 11:32:56 -04:00
parent 97fdce5f85
commit 0d9d8a057d
4 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/AudacityApp.h
View File

@ -95,9 +95,6 @@ enum CommandFlag : unsigned long long
AudioStreamNotScrubbingFlag
= 0x80000000ULL, // prl
// 33 bits! Boo-yah!
AudioIONotPausedFlag = 0x100000000ULL, // prl
NoFlagsSpecifed = ~0ULL
};

3
src/Menus.cpp
View File

@ -1763,9 +1763,6 @@ CommandFlag AudacityProject::GetUpdateFlags()
if(!GetScrubber().HasStartedScrubbing())
flags |= AudioStreamNotScrubbingFlag;
if (!gAudioIO->IsPaused())
flags |= AudioIONotPausedFlag;
return flags;
}

4
src/commands/CommandManager.cpp
View File

@ -1053,10 +1053,6 @@ void CommandManager::TellUserWhyDisallowed( CommandFlag flagsGot, CommandMask fl
reason = _("You must first select some audio for this to use.");
else if( missingFlags & WaveTracksSelectedFlag)
reason = _("You must first select some audio for this\n to use. (Selecting other kinds of track won't work.)");
else if( missingFlags & AudioStreamNotScrubbingFlag )
reason = _("Scrubbing may not be active.");
else if( missingFlags & AudioIONotBusyFlag )
reason = _("Playback may not be paused.");
// If the only thing wrong was no tracks, we do nothing and don't report a problem
else if( missingFlags == TracksExistFlag )
return;

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

@ -733,10 +733,9 @@ bool Scrubber::CanScrub() const
void Scrubber::AddMenuItems()
{
auto extraFlags = WaveTracksExistFlag | AudioIONotPausedFlag;
auto cm = mProject->GetCommandManager();
auto flags = cm->GetDefaultFlags() | extraFlags;
auto mask = cm->GetDefaultMask() | extraFlags;
auto flags = cm->GetDefaultFlags() | WaveTracksExistFlag;
auto mask = cm->GetDefaultMask() | WaveTracksExistFlag;
cm->BeginSubMenu(_("Scru&bbing"));
for (const auto &item : menuItems) {