Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-02 17:09:26 +02:00
Code Issues Releases Wiki Activity

ModuleManager defines the ID strings for modules, not PluginManager

Browse Source
This commit is contained in:
Paul Licameli 2021-06-23 07:18:16 -04:00
parent 50b384adae
commit 2e7f7114d2
4 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ModuleManager.cpp
View File

@ -403,6 +403,21 @@ ModuleManager & ModuleManager::Get()
return *mInstance; return *mInstance;
} }
wxString ModuleManager::GetPluginTypeString()
{
return L"Module";
}
PluginID ModuleManager::GetID(ModuleInterface *module)
{
return wxString::Format(wxT("%s_%s_%s_%s_%s"),
GetPluginTypeString(),
wxEmptyString,
module->GetVendor().Internal(),
module->GetSymbol().Internal(),
module->GetPath());
}
bool ModuleManager::DiscoverProviders() bool ModuleManager::DiscoverProviders()
{ {
InitializeBuiltins(); InitializeBuiltins();
@ -569,4 +584,3 @@ bool ModuleManager::IsPluginValid(const PluginID & providerID,
return mDynModules[providerID]->IsPluginValid(path, bFast); return mDynModules[providerID]->IsPluginValid(path, bFast);
} }

6
src/ModuleManager.h
View File

@ -77,6 +77,12 @@ public:
static ModuleManager & Get(); static ModuleManager & Get();
// This string persists in configuration files
// So config compatibility will break if it is changed across Audacity versions
static wxString GetPluginTypeString();
static PluginID GetID(ModuleInterface *module);
private: private:
static void FindModules(FilePaths &files); static void FindModules(FilePaths &files);
using DelayedErrors = using DelayedErrors =

12
src/PluginManager.cpp
View File

@ -1552,16 +1552,6 @@ ComponentInterface *PluginManager::GetInstance(const PluginID & ID)
} }
} }
PluginID PluginManager::GetID(ModuleInterface *module)
{
return wxString::Format(wxT("%s_%s_%s_%s_%s"),
GetPluginTypeString(PluginTypeModule),
wxEmptyString,
module->GetVendor().Internal(),
module->GetSymbol().Internal(),
module->GetPath());
}
PluginID PluginManager::GetID(ComponentInterface *command) PluginID PluginManager::GetID(ComponentInterface *command)
{ {
return wxString::Format(wxT("%s_%s_%s_%s_%s"), return wxString::Format(wxT("%s_%s_%s_%s_%s"),
@ -1620,7 +1610,7 @@ wxString PluginManager::GetPluginTypeString(PluginType type)
str = wxT("Importer"); str = wxT("Importer");
break; break;
case PluginTypeModule: case PluginTypeModule:
str = wxT("Module"); str = ModuleManager::GetPluginTypeString();
break; break;
} }

1
src/PluginManager.h
View File

@ -238,7 +238,6 @@ public:
static PluginManager & Get(); static PluginManager & Get();
static PluginID GetID(ModuleInterface *module);
static PluginID GetID(ComponentInterface *command); static PluginID GetID(ComponentInterface *command);
static PluginID GetID(EffectDefinitionInterface *effect); static PluginID GetID(EffectDefinitionInterface *effect);
static PluginID GetID(ImporterInterface *importer); static PluginID GetID(ImporterInterface *importer);