ModuleManager defines the ID strings for modules, not PluginManager
This commit is contained in:
parent
50b384adae
commit
2e7f7114d2
|
@ -403,6 +403,21 @@ ModuleManager & ModuleManager::Get()
|
|||
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()
|
||||
{
|
||||
InitializeBuiltins();
|
||||
|
@ -569,4 +584,3 @@ bool ModuleManager::IsPluginValid(const PluginID & providerID,
|
|||
|
||||
return mDynModules[providerID]->IsPluginValid(path, bFast);
|
||||
}
|
||||
|
||||
|
|
|
@ -77,6 +77,12 @@ public:
|
|||
|
||||
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:
|
||||
static void FindModules(FilePaths &files);
|
||||
using DelayedErrors =
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
return wxString::Format(wxT("%s_%s_%s_%s_%s"),
|
||||
|
@ -1620,7 +1610,7 @@ wxString PluginManager::GetPluginTypeString(PluginType type)
|
|||
str = wxT("Importer");
|
||||
break;
|
||||
case PluginTypeModule:
|
||||
str = wxT("Module");
|
||||
str = ModuleManager::GetPluginTypeString();
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
@ -238,7 +238,6 @@ public:
|
|||
|
||||
static PluginManager & Get();
|
||||
|
||||
static PluginID GetID(ModuleInterface *module);
|
||||
static PluginID GetID(ComponentInterface *command);
|
||||
static PluginID GetID(EffectDefinitionInterface *effect);
|
||||
static PluginID GetID(ImporterInterface *importer);
|
||||
|
|
Loading…
Reference in New Issue