ModuleManager doesn't use PluginManager to initialize providers

lupo42 · Jul 1, 2021 · 02b6153 · 02b6153
1 parent 2e7f711
commit 02b6153
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 23 deletions.
diff --git a/src/ModuleManager.cpp b/src/ModuleManager.cpp
@@ -448,29 +448,15 @@ bool ModuleManager::DiscoverProviders()
    FileNames::FindFilesInPathList(wxT("*.so"), pathList, provList);
 #endif
 
-   PluginManager & pm = PluginManager::Get();
-
-   for (int i = 0, cnt = provList.size(); i < cnt; i++)
-   {
-      ModuleInterface *module = LoadModule(provList[i]);
-      if (module)
-      {
-         // Register the provider
-         pm.RegisterPlugin(module);
-
-         // Now, allow the module to auto-register children
-         module->AutoRegisterPlugins(pm);
-      }
-   }
+   for ( const auto &path : provList )
+      LoadModule(path);
 #endif
 
    return true;
 }
 
 void ModuleManager::InitializeBuiltins()
 {
-   PluginManager & pm = PluginManager::Get();
-
    for (auto moduleMain : builtinModuleList())
    {
       ModuleInterfaceHandle module {
@@ -481,13 +467,10 @@ void ModuleManager::InitializeBuiltins()
       {
          // Register the provider
          ModuleInterface *pInterface = module.get();
-         const PluginID & id = pm.RegisterPlugin(pInterface);
+         auto id = GetID(pInterface);
 
          // Need to remember it 
          mDynModules[id] = std::move(module);
-
-         // Allow the module to auto-register children
-         pInterface->AutoRegisterPlugins(pm);
       }
       else
       {

diff --git a/src/ModuleManager.h b/src/ModuleManager.h
@@ -12,7 +12,8 @@
 #ifndef __AUDACITY_MODULEMANAGER_H__
 #define __AUDACITY_MODULEMANAGER_H__
 
-#include <memory>
+#include "MemoryX.h"
+#include <functional>
 #include <map>
 #include <vector>
 
@@ -98,6 +99,10 @@ class AUDACITY_DLL_API ModuleManager final
    // Can be called before Initialize()
    bool DiscoverProviders();
 
+   // Supports range-for iteration
+   auto Providers() const
+   { return make_iterator_range(mDynModules.cbegin(), mDynModules.cend()); }
+
    PluginPaths FindPluginsForProvider(const PluginID & provider, const PluginPath & path);
    bool RegisterEffectPlugin(const PluginID & provider, const PluginPath & path,
                        TranslatableString &errMsg);

diff --git a/src/PluginManager.cpp b/src/PluginManager.cpp
@@ -722,8 +722,13 @@ void PluginManager::Initialize()
    // And force load of setting to verify it's accessible
    GetSettings();
 
-   // Then look for providers (they may autoregister plugins)
-   ModuleManager::Get().DiscoverProviders();
+   auto &mm = ModuleManager::Get();
+   mm.DiscoverProviders();
+   for (const auto &[id, module] : mm.Providers()) {
+      RegisterPlugin(module.get());
+      // Allow the module to auto-register children
+      module->AutoRegisterPlugins(*this);
+   }
 
    // And finally check for updates
 #ifndef EXPERIMENTAL_EFFECT_MANAGEMENT