audacia
/
audacia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

3rd arg of TryToMakeActionAllows always == 2nd; eliminate it

This commit is contained in:
Paul Licameli 2019-06-09 02:06:49 -04:00
parent e5a786c420
commit 94d9593df8
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Menus.cpp
View File

@ -900,7 +900,7 @@ bool MenuManager::ReportIfActionNotAllowed(
const wxString & Name, CommandFlag & flags, CommandFlag flagsRqd )
{
auto &project = mProject;
bool bAllowed = TryToMakeActionAllowed( flags, flagsRqd, flagsRqd );
bool bAllowed = TryToMakeActionAllowed( flags, flagsRqd );
if( bAllowed )
return true;
auto &cm = CommandManager::Get( project );
@ -913,7 +913,7 @@ bool MenuManager::ReportIfActionNotAllowed(
/// If not, then try some recovery action to make it so.
/// @return whether compatible or not after any actions taken.
bool MenuManager::TryToMakeActionAllowed(
CommandFlag & flags, CommandFlag flagsRqd, CommandFlag mask )
CommandFlag & flags, CommandFlag flagsRqd )
{
auto &project = mProject;
bool bAllowed;
@ -921,19 +921,19 @@ bool MenuManager::TryToMakeActionAllowed(
if( flags.none() )
flags = GetUpdateFlags();
bAllowed = ((flags & mask) == (flagsRqd & mask));
bAllowed = ((flags & flagsRqd) == flagsRqd);
if( bAllowed )
return true;
// Why is action not allowed?
// 1's wherever a required flag is missing.
auto MissingFlags = (~flags & flagsRqd) & mask;
auto MissingFlags = (~flags & flagsRqd);
if( mStopIfWasPaused && (MissingFlags & AudioIONotBusyFlag ).any() ){
TransportActions::StopIfPaused( project );
// Hope this will now reflect stopped audio.
flags = GetUpdateFlags();
bAllowed = ((flags & mask) == (flagsRqd & mask));
bAllowed = ((flags & flagsRqd) == flagsRqd);
if( bAllowed )
return true;
}
@ -949,7 +949,7 @@ bool MenuManager::TryToMakeActionAllowed(
// Why is action still not allowed?
// 0's wherever a required flag is missing (or is don't care)
MissingFlags = (flags & ~flagsRqd) & mask;
MissingFlags = (flags & ~flagsRqd) & flagsRqd;
// IF selecting all audio won't do any good, THEN return with failure.
if( (flags & WaveTracksExistFlag).none() )
@ -967,6 +967,6 @@ bool MenuManager::TryToMakeActionAllowed(
// So changed to DoSelectAllAudio.
SelectActions::DoSelectAllAudio(project);
flags = GetUpdateFlags();
bAllowed = ((flags & mask) == (flagsRqd & mask));
bAllowed = ((flags & flagsRqd) == flagsRqd);
return bAllowed;
}

2
src/Menus.h
View File

@ -83,7 +83,7 @@ public:
bool ReportIfActionNotAllowed(
const wxString & Name, CommandFlag & flags, CommandFlag flagsRqd );
bool TryToMakeActionAllowed(
CommandFlag & flags, CommandFlag flagsRqd, CommandFlag mask );
CommandFlag & flags, CommandFlag flagsRqd );
private:

1
src/toolbars/ControlToolBar.cpp
View File

@ -1082,7 +1082,6 @@ bool ControlToolBar::DoRecord(AudacityProject &project,
// NB: The call may have the side effect of changing flags.
bool allowed = MenuManager::Get(project).TryToMakeActionAllowed(
flags,
AudioIONotBusyFlag | CanStopAudioStreamFlag,
AudioIONotBusyFlag | CanStopAudioStreamFlag);
if (!allowed)