Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-23 09:20:16 +01:00
Code Issues Releases Wiki Activity

Bug 2582 - Enh: Repeat last Process, Part 2 (#734)

Browse Source
This commit is contained in:
JohnColket
2021-02-03 06:02:49 -05:00
committed by GitHub
parent eb888bb03b
commit a3d9f41fb4
13 changed files with 180 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/commands/CommandManager.cpp
View File

@@ -235,6 +235,7 @@ CommandManager::CommandManager():
{
mbSeparatorAllowed = false;
SetMaxList();
mLastProcessId = 0;
}
///
@@ -722,23 +723,6 @@ CommandListEntry *CommandManager::NewIdentifier(const CommandID & nameIn,
entry->id = wxID_EXIT;
else if (name == wxT("About"))
entry->id = wxID_ABOUT;
#if defined(BE_CAREFUL)
// Don't be tempted to do this unless you're willing to change how
// HandleMenuID() decides if a menu action should be performed.
// (see comments 6-9 in bug #2642 for symptoms)
else if (name == wxT("Copy"))
entry->id = wxID_COPY;
else if (name == wxT("Cut"))
entry->id = wxID_CUT;
else if (name == wxT("Delete"))
entry->id = wxID_CLEAR;
else if (name == wxT("Paste"))
entry->id = wxID_PASTE;
else if (name == wxT("SelectAll"))
entry->id = wxID_SELECTALL;
#endif
#endif
entry->name = name;
@@ -1192,6 +1176,7 @@ bool CommandManager::FilterKeyEvent(AudacityProject *project, const wxKeyEvent &
return false;
}
/// HandleCommandEntry() takes a CommandListEntry and executes it
/// returning true iff successful. If you pass any flags,
///the command won't be executed unless the flags are compatible
@@ -1219,15 +1204,54 @@ bool CommandManager::HandleCommandEntry(AudacityProject &project,
// Otherwise we may get other handlers having a go at obeying the command.
if (!allowed)
return true;
mNiceName = NiceName;
}
else {
mNiceName = XO("");
}
const CommandContext context{ project, evt, entry->index, entry->parameter };
auto &handler = entry->finder(project);
(handler.*(entry->callback))(context);
mLastProcessId = 0;
return true;
}
// Called by Contrast and Plot Spectrum Plug-ins to mark them as Last Analzers.
// Note that Repeat data has previously been collected
void CommandManager::RegisterLastAnalyzer(const CommandContext& context) {
if (mLastProcessId != 0) {
auto& menuManager = MenuManager::Get(context.project);
menuManager.mLastAnalyzerRegistration = MenuCreator::repeattypeunique;
menuManager.mLastAnalyzerRegisteredId = mLastProcessId;
auto lastEffectDesc = XO("Repeat %s").Format(mNiceName);
Modify(wxT("RepeatLastAnalyzer"), lastEffectDesc);
}
return;
}
// Called by Selected Tools to mark them as Last Tools.
// Note that Repeat data has previously been collected
void CommandManager::RegisterLastTool(const CommandContext& context) {
if (mLastProcessId != 0) {
auto& menuManager = MenuManager::Get(context.project);
menuManager.mLastToolRegistration = MenuCreator::repeattypeunique;
menuManager.mLastToolRegisteredId = mLastProcessId;
auto lastEffectDesc = XO("Repeat %s").Format(mNiceName);
Modify(wxT("RepeatLastTool"), lastEffectDesc);
}
return;
}
// Used to invoke Repeat Last Analyzer Process for built-in, non-nyquist plug-ins.
void CommandManager::DoRepeatProcess(const CommandContext& context, int id) {
mLastProcessId = 0; //Don't Process this as repeat
CommandListEntry* entry = mCommandNumericIDHash[id];
auto& handler = entry->finder(context.project);
(handler.*(entry->callback))(context);
}
///Call this when a menu event is received.
///If it matches a command, it will call the appropriate
///CommandManagerListener function. If you pass any flags,
@@ -1236,6 +1260,7 @@ bool CommandManager::HandleCommandEntry(AudacityProject &project,
bool CommandManager::HandleMenuID(
AudacityProject &project, int id, CommandFlag flags, bool alwaysEnabled)
{
mLastProcessId = id;
CommandListEntry *entry = mCommandNumericIDHash[id];
auto hook = sMenuHook();

5
src/commands/CommandManager.h
View File

@@ -209,6 +209,9 @@ class AUDACITY_DLL_API CommandManager final
// Lyrics and MixerTrackCluster classes use it.
bool FilterKeyEvent(AudacityProject *project, const wxKeyEvent & evt, bool permit = false);
bool HandleMenuID(AudacityProject &project, int id, CommandFlag flags, bool alwaysEnabled);
void RegisterLastAnalyzer(const CommandContext& context);
void RegisterLastTool(const CommandContext& context);
void DoRepeatProcess(const CommandContext& context, int);
enum TextualCommandResult {
CommandFailure,
@@ -356,6 +359,8 @@ private:
bool mbSeparatorAllowed; // false at the start of a menu and immediately after a separator.
TranslatableString mCurrentMenuName;
TranslatableString mNiceName;
int mLastProcessId;
std::unique_ptr<wxMenu> uCurrentMenu;
wxMenu *mCurrentMenu {};