use io::completeBasename for generating resourceId as it was before PR …

…musescore#16990 (to maintain backward compatibility with old projects)
codecruisedor · Jul 4, 2023 · a33d4ed · a33d4ed
1 parent aec4811
commit a33d4ed
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/src/framework/audio/internal/plugins/registeraudiopluginsscenario.cpp b/src/framework/audio/internal/plugins/registeraudiopluginsscenario.cpp
@@ -152,7 +152,7 @@ mu::Ret RegisterAudioPluginsScenario::registerFailedPlugin(const io::path_t& plu
     }
 
     AudioPluginInfo info;
-    info.meta.id = io::filename(pluginPath).toStdString();
+    info.meta.id = io::completeBasename(pluginPath).toStdString();
 
     std::string ext = io::suffix(pluginPath);
     if (ext.find("vst") != std::string::npos) {

diff --git a/src/framework/audio/tests/registeraudiopluginsscenariotest.cpp b/src/framework/audio/tests/registeraudiopluginsscenariotest.cpp
@@ -288,7 +288,7 @@ TEST_F(Audio_RegisterAudioPluginsScenarioTest, RegisterFailedPlugin)
 
     // [THEN] The plugin has been registered
     AudioPluginInfo expectedPluginInfo;
-    expectedPluginInfo.meta.id = mu::io::filename(pluginPath).toStdString();
+    expectedPluginInfo.meta.id = mu::io::completeBasename(pluginPath).toStdString();
     expectedPluginInfo.meta.type = AudioResourceType::VstPlugin;
     expectedPluginInfo.path = pluginPath;
     expectedPluginInfo.enabled = false;

diff --git a/src/framework/vst/internal/vstplugin.cpp b/src/framework/vst/internal/vstplugin.cpp
@@ -108,10 +108,6 @@ void VstPlugin::load()
                 continue;
             }
 
-            if (classInfo.name() != m_resourceId) {
-                continue;
-            }
-
             m_pluginProvider = std::make_unique<VstPluginProvider>(factory, classInfo);
             m_classInfo = classInfo;
             break;

diff --git a/src/framework/vst/internal/vstpluginmetareader.cpp b/src/framework/vst/internal/vstpluginmetareader.cpp
@@ -64,13 +64,14 @@ mu::RetVal<AudioResourceMetaList> VstPluginMetaReader::readMeta(const io::path_t
         }
 
         audio::AudioResourceMeta meta;
-        meta.id = classInfo.name();
+        meta.id = io::completeBasename(pluginPath).toStdString();
         meta.type = audio::AudioResourceType::VstPlugin;
         meta.attributes.emplace(audio::CATEGORIES_ATTRIBUTE, String::fromStdString(classInfo.subCategoriesString()));
         meta.vendor = classInfo.vendor();
         meta.hasNativeEditorSupport = hasNativeEditorSupport();
 
         result.emplace_back(std::move(meta));
+        break;
     }
 
     return RetVal<AudioResourceMetaList>::make_ok(result);