brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle modelQuantizer as duplicated name

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2021-10-21 18:15:56 +01:00
parent ecd8976d6e
commit 9725d6859e
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
2 changed files with 30 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/plugins.cpp
View file

@ -212,7 +212,9 @@ extern Model *modelWriteSeq64;
extern Model *modelBlankPanel;
// JW-Modules
#define modelQuantizer modelJWQuantizer
#include "JW-Modules/src/JWModules.hpp"
#undef modelQuantizer
// rackwindows
#include "rackwindows/src/plugin.hpp"
@ -290,6 +292,8 @@ struct StaticPluginLoader {
file(nullptr),
rootJ(nullptr)
{
DEBUG("Loading plugin module %s", name);
p->path = asset::pluginPath(name);
const std::string manifestFilename = asset::pluginManifest(name);
@ -909,6 +913,7 @@ static void initStatic__JW()
const StaticPluginLoader spl(p, "JW-Modules");
if (spl.ok())
{
#define modelQuantizer modelJWQuantizer
p->addModel(modelAdd5);
p->addModel(modelBouncyBalls);
p->addModel(modelCat);
@ -938,6 +943,7 @@ static void initStatic__JW()
p->addModel(modelBlankPanelLarge);
p->addModel(modelCoolBreeze);
p->addModel(modelPete);
#undef modelQuantizer
}
}