LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix #10450: fixed update of VST effects on the master channel

Browse source
This commit is contained in:
Roman Pudashkin 2022-03-28 12:26:11 +02:00
parent 3a5a661c02
commit eaaafe5534
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/framework/vst/internal/fx/vstfxresolver.cpp
View file

@ -86,6 +86,8 @@ VstFxPtr VstFxResolver::createMasterFx(const audio::AudioFxParams& fxParams) con
VstPluginPtr pluginPtr = std::make_shared<VstPlugin>(modulePtr);
pluginsRegister()->registerMasterFxPlugin(fxParams.resourceMeta.id, fxParams.chainOrder, pluginPtr);
pluginPtr->load();
std::shared_ptr<VstFxProcessor> fx = std::make_shared<VstFxProcessor>(std::move(pluginPtr), fxParams);
fx->init();
@ -126,18 +128,14 @@ void VstFxResolver::updateTrackFxMap(FxMap& fxMap, const audio::TrackId trackId,
for (const auto& pair : fxToRemove) {
pluginsRegister()->unregisterFxPlugin(trackId, pair.second.resourceMeta.id, pair.second.chainOrder);
currentFxChain.erase(pair.second.chainOrder);
fxMap.erase(pair.second.chainOrder);
currentFxChain.erase(pair.first);
fxMap.erase(pair.first);
}
audio::AudioFxChain fxToCreate;
fxChainToCreate(currentFxChain, newFxChain, fxToCreate);
for (const auto& pair : fxToCreate) {
if (!pair.second.isValid()) {
continue;
}
VstFxPtr fxPtr = createTrackFx(trackId, pair.second);
if (fxPtr) {
@ -154,16 +152,16 @@ void VstFxResolver::updateMasterFxMap(const AudioFxChain& newFxChain)
}
audio::AudioFxChain fxToRemove;
fxChainToRemove(newFxChain, currentFxChain, fxToRemove);
fxChainToRemove(currentFxChain, newFxChain, fxToRemove);
for (const auto& pair : fxToRemove) {
pluginsRegister()->unregisterMasterFxPlugin(pair.second.resourceMeta.id, pair.second.chainOrder);
currentFxChain.erase(pair.second.chainOrder);
m_masterFxMap.erase(pair.second.chainOrder);
currentFxChain.erase(pair.first);
m_masterFxMap.erase(pair.first);
}
audio::AudioFxChain fxToCreate;
fxChainToCreate(newFxChain, currentFxChain, fxToCreate);
fxChainToCreate(currentFxChain, newFxChain, fxToCreate);
for (const auto& pair : fxToCreate) {
m_masterFxMap.emplace(pair.first, createMasterFx(pair.second));

2
src/framework/vst/internal/vstpluginsregister.cpp
View file

@ -121,7 +121,7 @@ VstPluginPtr VstPluginsRegister::masterFxPlugin(const audio::AudioResourceId& re
auto pluginSearch = m_masterPluginsMap.find({ resourceId, chainOrder });
if (pluginSearch == m_masterPluginsMap.end()) {
LOGE() << "Unable to find master plugin, resourceId: " << resourceId;
LOGE() << "Unable to find master plugin, resourceId: " << resourceId << ", chainOrder: " << chainOrder;
return nullptr;
}