Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-03-17 11:46:35 +01:00
Code Issues Releases Wiki Activity

Registry::Visit doesn't require an AudacityProject

Browse Source
This commit is contained in:
Paul Licameli
2020-01-26 16:10:26 -05:00
parent c7bfa7a2a6
commit 103a6050a0
4 changed files with 44 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/Menus.cpp
View File

@@ -195,15 +195,15 @@ struct CollectedItems
// alternate as the entire tree is recursively visited.
// forward declaration for mutually recursive functions
void CollectItem( AudacityProject &project,
void CollectItem( Registry::Visitor &visitor,
CollectedItems &collection, BaseItem *Item );
void CollectItems( AudacityProject &project,
void CollectItems( Registry::Visitor &visitor,
CollectedItems &collection, const BaseItemPtrs &items )
{
for ( auto &item : items )
CollectItem( project, collection, item.get() );
CollectItem( visitor, collection, item.get() );
}
void CollectItem( AudacityProject &project,
void CollectItem( Registry::Visitor &visitor,
CollectedItems &collection, BaseItem *pItem )
{
if (!pItem)
@@ -214,17 +214,17 @@ void CollectItem( AudacityProject &project,
dynamic_cast<SharedItem*>( pItem )) {
auto &delegate = pShared->ptr;
// recursion
CollectItem( project, collection, delegate.get() );
CollectItem( visitor, collection, delegate.get() );
}
else
if (const auto pComputed =
dynamic_cast<ComputedItem*>( pItem )) {
auto result = pComputed->factory( project );
auto result = pComputed->factory( visitor );
if (result) {
// Guarantee long enough lifetime of the result
collection.computedItems.push_back( result );
// recursion
CollectItem( project, collection, result.get() );
CollectItem( visitor, collection, result.get() );
}
}
else
@@ -232,7 +232,7 @@ void CollectItem( AudacityProject &project,
if (pGroup->Transparent() && pItem->name.empty())
// nameless grouping item is transparent to path calculations
// recursion
CollectItems( project, collection, pGroup->items );
CollectItems( visitor, collection, pGroup->items );
else
// all other group items
collection.items.push_back( pItem );
@@ -248,29 +248,26 @@ using Path = std::vector< Identifier >;
// forward declaration for mutually recursive functions
void VisitItem(
Registry::Visitor &visitor,
AudacityProject &project, CollectedItems &collection,
Registry::Visitor &visitor, CollectedItems &collection,
Path &path, BaseItem *pItem );
void VisitItems(
Registry::Visitor &visitor,
AudacityProject &project, CollectedItems &collection,
Registry::Visitor &visitor, CollectedItems &collection,
Path &path, GroupItem *pGroup )
{
// Make a new collection for this subtree, sharing the memo cache
CollectedItems newCollection{ {}, collection.computedItems };
// Gather items at this level
CollectItems( project, newCollection, pGroup->items );
CollectItems( visitor, newCollection, pGroup->items );
// Now visit them
path.push_back( pGroup->name );
for ( const auto &pSubItem : newCollection.items )
VisitItem( visitor, project, collection, path, pSubItem );
VisitItem( visitor, collection, path, pSubItem );
path.pop_back();
}
void VisitItem(
Registry::Visitor &visitor,
AudacityProject &project, CollectedItems &collection,
Registry::Visitor &visitor, CollectedItems &collection,
Path &path, BaseItem *pItem )
{
if (!pItem)
@@ -285,7 +282,7 @@ void VisitItem(
dynamic_cast<GroupItem*>( pItem )) {
visitor.BeginGroup( *pGroup, path );
// recursion
VisitItems( visitor, project, collection, path, pGroup );
VisitItems( visitor, collection, path, pGroup );
visitor.EndGroup( *pGroup, path );
}
else
@@ -296,14 +293,12 @@ void VisitItem(
namespace Registry {
void Visit(
Visitor &visitor, AudacityProject &project,
BaseItem *pTopItem )
void Visit( Visitor &visitor, BaseItem *pTopItem )
{
std::vector< BaseItemSharedPtr > computedItems;
CollectedItems collection{ {}, computedItems };
Path emptyPath;
VisitItem( visitor, project, collection, emptyPath, pTopItem );
VisitItem( visitor, collection, emptyPath, pTopItem );
}
}
@@ -354,10 +349,10 @@ static const auto menuTree = MenuTable::Items( MenuPathStart
);
namespace {
struct MenuItemVisitor : Registry::Visitor
struct MenuItemVisitor : MenuVisitor
{
MenuItemVisitor( AudacityProject &proj, CommandManager &man )
: project(proj), manager( man ) {}
: MenuVisitor(proj), manager( man ) {}
void BeginGroup( GroupItem &item, const Path& ) override
{
@@ -440,7 +435,6 @@ struct MenuItemVisitor : Registry::Visitor
wxASSERT( false );
}
AudacityProject &project;
CommandManager &manager;
std::vector<bool> flags;
};
@@ -458,7 +452,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
wxASSERT(menubar);
MenuItemVisitor visitor{ project, commandManager };
MenuManager::Visit( visitor, project );
MenuManager::Visit( visitor );
GetProjectFrame( project ).SetMenuBar(menubar.release());
@@ -469,9 +463,9 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
#endif
}
void MenuManager::Visit( Registry::Visitor &visitor, AudacityProject &project )
void MenuManager::Visit( MenuVisitor &visitor )
{
Registry::Visit( visitor, project, menuTree.get() );
Registry::Visit( visitor, menuTree.get() );
}
// TODO: This surely belongs in CommandManager?