Skip to content

Pass progress to plugin scanner #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grliszas14 merged 1 commit into from
May 13, 2026
Merged

Pass progress to plugin scanner #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion framework/audioplugins/iaudiopluginsscanner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,15 @@
#include <memory>

#include "global/io/path.h"
#include "global/progress.h"

namespace muse::audioplugins {
class IAudioPluginsScanner
{
public:
virtual ~IAudioPluginsScanner() = default;

virtual io::paths_t scanPlugins() const = 0;
virtual io::paths_t scanPlugins(Progress* progress = nullptr) const = 0;
};

using IAudioPluginsScannerPtr = std::shared_ptr<IAudioPluginsScanner>;
Expand Down
4 changes: 2 additions & 2 deletions framework/audioplugins/internal/registeraudiopluginsscenario.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ void RegisterAudioPluginsScenario::init()
}
}

PluginScanResult RegisterAudioPluginsScenario::scanPlugins() const
PluginScanResult RegisterAudioPluginsScenario::scanPlugins(Progress* progress) const
{
TRACEFUNC;

Expand All @@ -62,7 +62,7 @@ PluginScanResult RegisterAudioPluginsScenario::scanPlugins() const
}

for (const auto& scanner : scannerRegister()->scanners()) {
for (const auto& path : scanner->scanPlugins()) {
for (const auto& path : scanner->scanPlugins(progress)) {
if (auto it = registered.find(path); it != registered.end()) {
registered.erase(it);
} else {
Expand Down
2 changes: 1 addition & 1 deletion framework/audioplugins/internal/registeraudiopluginsscenario.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class RegisterAudioPluginsScenario : public IRegisterAudioPluginsScenario, publi

void init();

PluginScanResult scanPlugins() const override;
PluginScanResult scanPlugins(Progress* progress = nullptr) const override;

Ret updatePluginsRegistry() override;
void registerNewPlugins(const io::paths_t& pluginPaths) override;
Expand Down
5 changes: 2 additions & 3 deletions framework/audioplugins/iregisteraudiopluginsscenario.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,8 @@

#include "modularity/imoduleinterface.h"

#include "global/types/ret.h"
#include "global/io/path.h"
#include "audio/common/audiotypes.h"
#include "global/progress.h"

namespace muse::audioplugins {
struct PluginScanResult {
Expand All @@ -41,7 +40,7 @@ class IRegisterAudioPluginsScenario : MODULE_CONTEXT_INTERFACE
public:
virtual ~IRegisterAudioPluginsScenario() = default;

virtual PluginScanResult scanPlugins() const = 0;
virtual PluginScanResult scanPlugins(Progress* progress = nullptr) const = 0;

virtual Ret updatePluginsRegistry() = 0;
virtual void registerNewPlugins(const io::paths_t& pluginPaths) = 0;
Expand Down
2 changes: 1 addition & 1 deletion framework/audioplugins/tests/mocks/audiopluginsscannermock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ namespace muse::audioplugins {
class AudioPluginsScannerMock : public IAudioPluginsScanner
{
public:
MOCK_METHOD(io::paths_t, scanPlugins, (), (const, override));
MOCK_METHOD(io::paths_t, scanPlugins, (Progress * progress), (const, override));
};
}
6 changes: 3 additions & 3 deletions framework/audioplugins/tests/registeraudiopluginsscenariotest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ TEST_F(AudioPlugins_RegisterAudioPluginsScenarioTest, UpdatePluginsRegistry)
AudioPluginsScannerMock* mock = dynamic_cast<AudioPluginsScannerMock*>(scanner.get());
ASSERT_TRUE(mock);

ON_CALL(*mock, scanPlugins())
ON_CALL(*mock, scanPlugins(_))
.WillByDefault(Return(foundPluginPaths));
}

Expand Down Expand Up @@ -216,7 +216,7 @@ TEST_F(AudioPlugins_RegisterAudioPluginsScenarioTest, UpdatePluginsRegistry_NoNe
AudioPluginsScannerMock* mock = dynamic_cast<AudioPluginsScannerMock*>(scanner.get());
ASSERT_TRUE(mock);

ON_CALL(*mock, scanPlugins())
ON_CALL(*mock, scanPlugins(_))
.WillByDefault(Return(foundPluginPaths));
}

Expand Down Expand Up @@ -281,7 +281,7 @@ TEST_F(AudioPlugins_RegisterAudioPluginsScenarioTest, UpdatePluginsRegistry_Unre
AudioPluginsScannerMock* mock = dynamic_cast<AudioPluginsScannerMock*>(scanner.get());
ASSERT_TRUE(mock);

ON_CALL(*mock, scanPlugins())
ON_CALL(*mock, scanPlugins(_))
.WillByDefault(Return(foundPluginPaths));
}

Expand Down
2 changes: 1 addition & 1 deletion framework/vst/internal/vstpluginsscanner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static io::paths_t pluginPathsFromDefaultLocation()
}
}

io::paths_t VstPluginsScanner::scanPlugins() const
io::paths_t VstPluginsScanner::scanPlugins(Progress*) const
{
TRACEFUNC;

Expand Down
2 changes: 1 addition & 1 deletion framework/vst/internal/vstpluginsscanner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class VstPluginsScanner : public audioplugins::IAudioPluginsScanner
GlobalInject<io::IFileSystem> fileSystem;

public:
io::paths_t scanPlugins() const override;
io::paths_t scanPlugins(Progress* progress = nullptr) const override;

private:
io::paths_t pluginPathsFromCustomLocations(const io::paths_t& customPaths) const;
Expand Down