Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-04-01 03:54:47 +02:00
Code Issues Releases Wiki Activity

Fix other problems since commit f6e5696...

Browse Source 
... Problem with static initialization order of ReservedCommandFlags, caused
wrong enablement of menu items (at least on Mac), such as Plot Spectrum or
Contrast enabled when there was no selection
This commit is contained in:
Paul Licameli
2020-01-28 16:37:11 -05:00
parent 3c9cd7925a
commit 9093364b8c
22 changed files with 381 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ProjectAudioManager.cpp
View File

@@ -538,7 +538,7 @@ bool ProjectAudioManager::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)
return false;
@@ -939,14 +939,14 @@ bool ProjectAudioManager::CanStopAudioStream() const
gAudioIO->GetOwningProject() == &mProject );
}
const ReservedCommandFlag
CanStopAudioStreamFlag{
const ReservedCommandFlag&
CanStopAudioStreamFlag(){ static ReservedCommandFlag flag{
[](const AudacityProject &project){
auto &projectAudioManager = ProjectAudioManager::Get( project );
bool canStop = projectAudioManager.CanStopAudioStream();
return canStop;
}
};
}; return flag; }
AudioIOStartStreamOptions
DefaultPlayOptions( AudacityProject &project )
@@ -1091,8 +1091,8 @@ void ProjectAudioManager::DoPlayStopSelect()
#include "CommonCommandFlags.h"
static RegisteredMenuItemEnabler stopIfPaused{{
[]{ return PausedFlag; },
[]{ return AudioIONotBusyFlag; },
[]{ return PausedFlag(); },
[]{ return AudioIONotBusyFlag(); },
[]( const AudacityProject &project ){
return MenuManager::Get( project ).mStopIfWasPaused; },
[]( AudacityProject &project, CommandFlag ){