Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-04 17:49:45 +02:00
Code Issues Releases Wiki Activity

Some functions can be static, don't need to be members of MenuBuilder

Browse Source
This commit is contained in:
Paul Licameli 2018-10-19 11:38:43 -04:00
parent b38af473c6
commit 474f80912a
2 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/Menus.cpp
View File

@ -149,6 +149,24 @@ menu items.
#include "./commands/AudacityCommand.h"
#include "commands/CommandContext.h"
static void PopulateMacrosMenu( CommandManager* c, CommandFlag flags );
static void PopulateEffectsMenu(CommandManager* c,
EffectType type,
CommandFlag batchflags,
CommandFlag realflags);
static void AddEffectMenuItems(CommandManager *c,
std::vector<const PluginDescriptor*> & plugs,
CommandFlag batchflags,
CommandFlag realflags,
bool isDefault);
static void AddEffectMenuItemGroup(CommandManager *c,
const wxArrayString & names,
const std::vector<bool> &vHasDialog,
const PluginIDList & plugs,
const std::vector<CommandFlag> & flags,
bool isDefault);
static void CreateRecentFilesMenu(CommandManager *c);
MenuCommandHandler &GetMenuCommandHandler(AudacityProject &project)
{ return *project.mMenuCommandHandler; }
@ -1848,7 +1866,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
void MenuCreator::PopulateMacrosMenu( CommandManager* c, CommandFlag flags )
void PopulateMacrosMenu( CommandManager* c, CommandFlag flags )
{
wxArrayString names = MacroCommands::GetNames();
int i;
@ -1865,10 +1883,10 @@ void MenuCreator::PopulateMacrosMenu( CommandManager* c, CommandFlag flags )
/// The effects come from a plug in list
/// This code iterates through the list, adding effects into
/// the menu.
void MenuCreator::PopulateEffectsMenu(CommandManager* c,
EffectType type,
CommandFlag batchflags,
CommandFlag realflags)
void PopulateEffectsMenu(CommandManager* c,
EffectType type,
CommandFlag batchflags,
CommandFlag realflags)
{
PluginManager & pm = PluginManager::Get();
@ -1928,7 +1946,7 @@ void MenuCreator::PopulateEffectsMenu(CommandManager* c,
return;
}
void MenuCreator::AddEffectMenuItems(CommandManager *c,
void AddEffectMenuItems(CommandManager *c,
std::vector<const PluginDescriptor*> & plugs,
CommandFlag batchflags,
CommandFlag realflags,
@ -2069,12 +2087,12 @@ void MenuCreator::AddEffectMenuItems(CommandManager *c,
return;
}
void MenuCreator::AddEffectMenuItemGroup(CommandManager *c,
const wxArrayString & names,
const std::vector<bool> &vHasDialog,
const PluginIDList & plugs,
const std::vector<CommandFlag> & flags,
bool isDefault)
void AddEffectMenuItemGroup(CommandManager *c,
const wxArrayString & names,
const std::vector<bool> &vHasDialog,
const PluginIDList & plugs,
const std::vector<CommandFlag> & flags,
bool isDefault)
{
int namesCnt = (int) names.GetCount();
int perGroup;
@ -2176,7 +2194,7 @@ void MenuCreator::AddEffectMenuItemGroup(CommandManager *c,
#undef FN
void MenuCreator::CreateRecentFilesMenu(CommandManager *c)
void CreateRecentFilesMenu(CommandManager *c)
{
// Recent Files and Recent Projects menus

13
src/Menus.h
View File

@ -604,19 +604,6 @@ public:
void CreateMenusAndCommands(AudacityProject &project);
void RebuildMenuBar(AudacityProject &project);
void PopulateMacrosMenu( CommandManager* c, CommandFlag flags );
void PopulateEffectsMenu(CommandManager *c, EffectType type,
CommandFlag batchflags, CommandFlag realflags);
void AddEffectMenuItems(CommandManager *c,
std::vector<const PluginDescriptor*> & plugs,
CommandFlag batchflags, CommandFlag realflags, bool isDefault);
void AddEffectMenuItemGroup(CommandManager *c, const wxArrayString & names,
const std::vector<bool> &vHasDialog,
const PluginIDList & plugs,
const std::vector<CommandFlag> & flags, bool isDefault);
void CreateRecentFilesMenu(CommandManager *c);
public:
CommandFlag mLastFlags;