From 0d9d8a057d523d25bca138b1040f32558eaeca71 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Fri, 6 May 2016 11:32:56 -0400
Subject: [PATCH] Revert "Disable scrubbing when pause button is down."

This reverts commit 97fdce5f85e884cbe6f161963789694015cdf328.
---
 src/AudacityApp.h               | 3 ---
 src/Menus.cpp                   | 3 ---
 src/commands/CommandManager.cpp | 4 ----
 src/tracks/ui/Scrubbing.cpp     | 5 ++---
 4 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/AudacityApp.h b/src/AudacityApp.h
index 8b4657871..b103f8989 100644
--- a/src/AudacityApp.h
+++ b/src/AudacityApp.h
@@ -95,9 +95,6 @@ enum CommandFlag : unsigned long long
    AudioStreamNotScrubbingFlag
                           = 0x80000000ULL, // prl
 
-   // 33 bits!  Boo-yah!
-   AudioIONotPausedFlag  = 0x100000000ULL, // prl
-
    NoFlagsSpecifed        = ~0ULL
 };
 
diff --git a/src/Menus.cpp b/src/Menus.cpp
index d363a2d31..e02a79779 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -1763,9 +1763,6 @@ CommandFlag AudacityProject::GetUpdateFlags()
    if(!GetScrubber().HasStartedScrubbing())
       flags |= AudioStreamNotScrubbingFlag;
 
-   if (!gAudioIO->IsPaused())
-      flags |= AudioIONotPausedFlag;
-
    return flags;
 }
 
diff --git a/src/commands/CommandManager.cpp b/src/commands/CommandManager.cpp
index 8ed906475..fc9b28164 100644
--- a/src/commands/CommandManager.cpp
+++ b/src/commands/CommandManager.cpp
@@ -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;
diff --git a/src/tracks/ui/Scrubbing.cpp b/src/tracks/ui/Scrubbing.cpp
index 84a2a11e1..ba041a8f1 100644
--- a/src/tracks/ui/Scrubbing.cpp
+++ b/src/tracks/ui/Scrubbing.cpp
@@ -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) {