virtual AudioResourceType IAudioPluginMetaReader::metaType() const = 0;

Author: Matthieu Hodgkinson

src/framework/audioplugins/iaudiopluginmetareader.h

@@ -32,6 +32,7 @@ class IAudioPluginMetaReader
 public:
     virtual ~IAudioPluginMetaReader() = default;
 
+    virtual audio::AudioResourceType metaType() const = 0;
     virtual bool canReadMeta(const io::path_t& pluginPath) const = 0;
     virtual RetVal<audio::AudioResourceMetaList> readMeta(const io::path_t& pluginPath) const = 0;
 };

src/framework/audioplugins/internal/registeraudiopluginsscenario.cpp

@@ -156,11 +156,7 @@ Ret RegisterAudioPluginsScenario::registerFailedPlugin(const io::path_t& pluginP
     AudioPluginInfo info;
     info.meta.id = io::completeBasename(pluginPath).toStdString();
 
-    std::string ext = io::suffix(pluginPath);
-    if (ext.find("vst") != std::string::npos) {
-        info.meta.type = AudioResourceType::VstPlugin;
-    }
-
+    info.meta.type = metaType(pluginPath);
     info.path = pluginPath;
     info.enabled = false;
     info.errorCode = failCode;
@@ -179,3 +175,9 @@ IAudioPluginMetaReaderPtr RegisterAudioPluginsScenario::metaReader(const io::pat
 
     return nullptr;
 }
+
+audio::AudioResourceType RegisterAudioPluginsScenario::metaType(const io::path_t& pluginPath) const
+{
+    const IAudioPluginMetaReaderPtr reader = metaReader(pluginPath);
+    return reader ? reader->metaType() : audio::AudioResourceType::Undefined;
+}

src/framework/audioplugins/internal/registeraudiopluginsscenario.h

@@ -57,6 +57,7 @@ class RegisterAudioPluginsScenario : public IRegisterAudioPluginsScenario, publi
 private:
     void processPluginsRegistration(const io::paths_t& pluginPaths);
     IAudioPluginMetaReaderPtr metaReader(const io::path_t& pluginPath) const;
+    audio::AudioResourceType metaType(const io::path_t& pluginPath) const;
 
     Progress m_progress;
     bool m_aborted = false;

src/framework/audioplugins/tests/mocks/audiopluginmetareadermock.h

@@ -29,6 +29,7 @@ namespace muse::audioplugins {
 class AudioPluginMetaReaderMock : public IAudioPluginMetaReader
 {
 public:
+    MOCK_METHOD(audio::AudioResourceType, metaType, (), (const, override));
     MOCK_METHOD(bool, canReadMeta, (const io::path_t&), (const, override));
     MOCK_METHOD(RetVal<audio::AudioResourceMetaList>, readMeta, (const io::path_t&), (const, override));
 };

src/framework/audioplugins/tests/registeraudiopluginsscenariotest.cpp

@@ -58,7 +58,9 @@ class AudioPlugins_RegisterAudioPluginsScenarioTest : public ::testing::Test
         m_knownPlugins = std::make_shared<KnownAudioPluginsRegisterMock>();
         m_scanners = { std::make_shared<AudioPluginsScannerMock>() };
         m_metaReaderRegister = std::make_shared<AudioPluginMetaReaderRegisterMock>();
-        m_metaReaders = { std::make_shared<AudioPluginMetaReaderMock>() };
+
+        const auto metaReaderMock = std::make_shared<AudioPluginMetaReaderMock>();
+        m_metaReaders = { metaReaderMock };
 
         m_scenario->globalConfiguration.set(m_globalConfiguration);
         m_scenario->interactive.set(m_interactive);
@@ -75,6 +77,12 @@ class AudioPlugins_RegisterAudioPluginsScenarioTest : public ::testing::Test
 
         ON_CALL(*m_metaReaderRegister, readers())
         .WillByDefault(ReturnRef(m_metaReaders));
+
+        ON_CALL(*metaReaderMock, metaType())
+        .WillByDefault(Return(AudioResourceType::VstPlugin));
+
+        ON_CALL(*metaReaderMock, canReadMeta(_))
+        .WillByDefault(Return(true));
     }
 
     std::shared_ptr<RegisterAudioPluginsScenario> m_scenario;
@@ -256,9 +264,6 @@ TEST_F(AudioPlugins_RegisterAudioPluginsScenarioTest, RegisterPlugin)
     AudioPluginMetaReaderMock* mock = dynamic_cast<AudioPluginMetaReaderMock*>(m_metaReaders[0].get());
     ASSERT_TRUE(mock);
 
-    ON_CALL(*mock, canReadMeta(pluginPath))
-    .WillByDefault(Return(true));
-
     ON_CALL(*mock, readMeta(pluginPath))
     .WillByDefault(Return(RetVal<AudioResourceMetaList>::make_ok(metaList)));
 

src/framework/vst/internal/vstpluginmetareader.cpp

@@ -31,6 +31,11 @@ using namespace muse;
 using namespace muse::audio;
 using namespace muse::vst;
 
+audio::AudioResourceType VstPluginMetaReader::metaType() const
+{
+    return audio::AudioResourceType::VstPlugin;
+}
+
 bool VstPluginMetaReader::canReadMeta(const io::path_t& pluginPath) const
 {
     return io::suffix(pluginPath) == VST3_PACKAGE_EXTENSION;

src/framework/vst/internal/vstpluginmetareader.h

@@ -29,6 +29,7 @@ namespace muse::vst {
 class VstPluginMetaReader : public audioplugins::IAudioPluginMetaReader
 {
 public:
+    audio::AudioResourceType metaType() const override;
     bool canReadMeta(const io::path_t& pluginPath) const override;
     RetVal<muse::audio::AudioResourceMetaList> readMeta(const io::path_t& pluginPath) const override;
 };