From 0a0cde96574b7d264b9a102ddc994da2a7516585 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Tue, 29 Jan 2019 13:16:06 -0500 Subject: [PATCH] Rename plugin variable to avoid name collision --- src/8vert.cpp | 2 +- src/ADSR.cpp | 2 +- src/Delay.cpp | 2 +- src/Fundamental.cpp | 4 ++-- src/LFO.cpp | 4 ++-- src/Mutes.cpp | 2 +- src/SEQ3.cpp | 2 +- src/Scope.cpp | 4 ++-- src/SequentialSwitch.cpp | 4 ++-- src/Unity.cpp | 2 +- src/VCA.cpp | 4 ++-- src/VCF.cpp | 2 +- src/VCMixer.cpp | 2 +- src/VCO.cpp | 4 ++-- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/8vert.cpp b/src/8vert.cpp index dff3571..2697f74 100644 --- a/src/8vert.cpp +++ b/src/8vert.cpp @@ -42,7 +42,7 @@ struct _8vert : Module { struct _8vertWidget : ModuleWidget { _8vertWidget(_8vert *module) { setModule(module); - setPanel(SVG::load(asset::plugin(plugin, "res/8vert.svg"))); + setPanel(SVG::load(asset::plugin(pluginInstance, "res/8vert.svg"))); addChild(createWidget(Vec(15, 0))); addChild(createWidget(Vec(box.size.x - 30, 0))); diff --git a/src/ADSR.cpp b/src/ADSR.cpp index d880ada..b23b449 100644 --- a/src/ADSR.cpp +++ b/src/ADSR.cpp @@ -108,7 +108,7 @@ struct ADSR : Module { struct ADSRWidget : ModuleWidget { ADSRWidget(ADSR *module) { setModule(module); - setPanel(SVG::load(asset::plugin(plugin, "res/ADSR.svg"))); + setPanel(SVG::load(asset::plugin(pluginInstance, "res/ADSR.svg"))); addChild(createWidget(Vec(15, 0))); addChild(createWidget(Vec(box.size.x-30, 0))); diff --git a/src/Delay.cpp b/src/Delay.cpp index 5d28337..0094894 100644 --- a/src/Delay.cpp +++ b/src/Delay.cpp @@ -113,7 +113,7 @@ struct Delay : Module { struct DelayWidget : ModuleWidget { DelayWidget(Delay *module) { setModule(module); - setPanel(SVG::load(asset::plugin(plugin, "res/Delay.svg"))); + setPanel(SVG::load(asset::plugin(pluginInstance, "res/Delay.svg"))); addChild(createWidget(Vec(15, 0))); addChild(createWidget(Vec(box.size.x-30, 0))); diff --git a/src/Fundamental.cpp b/src/Fundamental.cpp index 5671e48..505cb2d 100644 --- a/src/Fundamental.cpp +++ b/src/Fundamental.cpp @@ -1,10 +1,10 @@ #include "Fundamental.hpp" -Plugin *plugin; +Plugin *pluginInstance; void init(rack::Plugin *p) { - plugin = p; + pluginInstance = p; p->addModel(modelVCO); p->addModel(modelVCO2); diff --git a/src/LFO.cpp b/src/LFO.cpp index 72bec8e..f9bc0a8 100644 --- a/src/LFO.cpp +++ b/src/LFO.cpp @@ -131,7 +131,7 @@ struct LFO : Module { struct LFOWidget : ModuleWidget { LFOWidget(LFO *module) { setModule(module); - setPanel(SVG::load(asset::plugin(plugin, "res/LFO-1.svg"))); + setPanel(SVG::load(asset::plugin(pluginInstance, "res/LFO-1.svg"))); addChild(createWidget(Vec(15, 0))); addChild(createWidget(Vec(box.size.x-30, 0))); @@ -228,7 +228,7 @@ struct LFO2 : Module { struct LFO2Widget : ModuleWidget { LFO2Widget(LFO2 *module) { setModule(module); - setPanel(SVG::load(asset::plugin(plugin, "res/LFO-2.svg"))); + setPanel(SVG::load(asset::plugin(pluginInstance, "res/LFO-2.svg"))); addChild(createWidget(Vec(15, 0))); addChild(createWidget(Vec(box.size.x-30, 0))); diff --git a/src/Mutes.cpp b/src/Mutes.cpp index 23a9100..636301b 100644 --- a/src/Mutes.cpp +++ b/src/Mutes.cpp @@ -94,7 +94,7 @@ struct MuteLight : BASE { struct MutesWidget : ModuleWidget { MutesWidget(Mutes *module) { setModule(module); - setPanel(SVG::load(asset::plugin(plugin, "res/Mutes.svg"))); + setPanel(SVG::load(asset::plugin(pluginInstance, "res/Mutes.svg"))); addChild(createWidget(Vec(15, 0))); addChild(createWidget(Vec(box.size.x - 30, 0))); diff --git a/src/SEQ3.cpp b/src/SEQ3.cpp index e278b50..2764269 100644 --- a/src/SEQ3.cpp +++ b/src/SEQ3.cpp @@ -175,7 +175,7 @@ struct SEQ3 : Module { struct SEQ3Widget : ModuleWidget { SEQ3Widget(SEQ3 *module) { setModule(module); - setPanel(SVG::load(asset::plugin(plugin, "res/SEQ3.svg"))); + setPanel(SVG::load(asset::plugin(pluginInstance, "res/SEQ3.svg"))); addChild(createWidget(Vec(15, 0))); addChild(createWidget(Vec(box.size.x-30, 0))); diff --git a/src/Scope.cpp b/src/Scope.cpp index ac85942..be17f7e 100644 --- a/src/Scope.cpp +++ b/src/Scope.cpp @@ -164,7 +164,7 @@ struct ScopeDisplay : TransparentWidget { Stats statsX, statsY; ScopeDisplay() { - font = Font::load(asset::plugin(plugin, "res/fonts/Sudo.ttf")); + font = Font::load(asset::plugin(pluginInstance, "res/fonts/Sudo.ttf")); } void drawWaveform(const DrawContext &ctx, float *valuesX, float *valuesY) { @@ -313,7 +313,7 @@ struct ScopeDisplay : TransparentWidget { struct ScopeWidget : ModuleWidget { ScopeWidget(Scope *module) { setModule(module); - setPanel(SVG::load(asset::plugin(plugin, "res/Scope.svg"))); + setPanel(SVG::load(asset::plugin(pluginInstance, "res/Scope.svg"))); addChild(createWidget(Vec(15, 0))); addChild(createWidget(Vec(box.size.x-30, 0))); diff --git a/src/SequentialSwitch.cpp b/src/SequentialSwitch.cpp index 4096812..65f8292 100644 --- a/src/SequentialSwitch.cpp +++ b/src/SequentialSwitch.cpp @@ -81,7 +81,7 @@ struct SequentialSwitch1Widget : ModuleWidget { SequentialSwitch1Widget(SequentialSwitch<1> *module) { setModule(module); - setPanel(SVG::load(asset::plugin(plugin, "res/SequentialSwitch1.svg"))); + setPanel(SVG::load(asset::plugin(pluginInstance, "res/SequentialSwitch1.svg"))); addChild(createWidget(Vec(RACK_GRID_WIDTH, 0))); addChild(createWidget(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH))); @@ -113,7 +113,7 @@ struct SequentialSwitch2Widget : ModuleWidget { SequentialSwitch2Widget(SequentialSwitch<2> *module) { setModule(module); - setPanel(SVG::load(asset::plugin(plugin, "res/SequentialSwitch2.svg"))); + setPanel(SVG::load(asset::plugin(pluginInstance, "res/SequentialSwitch2.svg"))); addChild(createWidget(Vec(RACK_GRID_WIDTH, 0))); addChild(createWidget(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH))); diff --git a/src/Unity.cpp b/src/Unity.cpp index e0c0050..df8938d 100644 --- a/src/Unity.cpp +++ b/src/Unity.cpp @@ -106,7 +106,7 @@ struct UnityMergeItem : MenuItem { struct UnityWidget : ModuleWidget { UnityWidget(Unity *module) { setModule(module); - setPanel(SVG::load(asset::plugin(plugin, "res/Unity.svg"))); + setPanel(SVG::load(asset::plugin(pluginInstance, "res/Unity.svg"))); addChild(createWidget(Vec(15, 0))); addChild(createWidget(Vec(box.size.x - 30, 0))); diff --git a/src/VCA.cpp b/src/VCA.cpp index 19a3c43..aed375b 100644 --- a/src/VCA.cpp +++ b/src/VCA.cpp @@ -49,7 +49,7 @@ struct VCA : Module { struct VCAWidget : ModuleWidget { VCAWidget(VCA *module) { setModule(module); - setPanel(SVG::load(asset::plugin(plugin, "res/VCA.svg"))); + setPanel(SVG::load(asset::plugin(pluginInstance, "res/VCA.svg"))); addChild(createWidget(Vec(RACK_GRID_WIDTH, 0))); addChild(createWidget(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0))); @@ -155,7 +155,7 @@ struct VCA_1VUKnob : SliderKnob { struct VCA_1Widget : ModuleWidget { VCA_1Widget(VCA_1 *module) { setModule(module); - setPanel(SVG::load(asset::plugin(plugin, "res/VCA-1.svg"))); + setPanel(SVG::load(asset::plugin(pluginInstance, "res/VCA-1.svg"))); addChild(createWidget(Vec(RACK_GRID_WIDTH, 0))); addChild(createWidget(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0))); diff --git a/src/VCF.cpp b/src/VCF.cpp index e33a8e7..c2a1e2a 100644 --- a/src/VCF.cpp +++ b/src/VCF.cpp @@ -152,7 +152,7 @@ struct VCF : Module { struct VCFWidget : ModuleWidget { VCFWidget(VCF *module) { setModule(module); - setPanel(SVG::load(asset::plugin(plugin, "res/VCF.svg"))); + setPanel(SVG::load(asset::plugin(pluginInstance, "res/VCF.svg"))); addChild(createWidget(Vec(15, 0))); addChild(createWidget(Vec(box.size.x - 30, 0))); diff --git a/src/VCMixer.cpp b/src/VCMixer.cpp index 0b13c4b..befacef 100644 --- a/src/VCMixer.cpp +++ b/src/VCMixer.cpp @@ -49,7 +49,7 @@ struct VCMixer : Module { struct VCMixerWidget : ModuleWidget { VCMixerWidget(VCMixer *module) { setModule(module); - setPanel(SVG::load(asset::plugin(plugin, "res/VCMixer.svg"))); + setPanel(SVG::load(asset::plugin(pluginInstance, "res/VCMixer.svg"))); addChild(createWidget(Vec(RACK_GRID_WIDTH, 0))); addChild(createWidget(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0))); diff --git a/src/VCO.cpp b/src/VCO.cpp index 9b69e64..1a3e29e 100644 --- a/src/VCO.cpp +++ b/src/VCO.cpp @@ -238,7 +238,7 @@ struct VCO : Module { struct VCOWidget : ModuleWidget { VCOWidget(VCO *module) { setModule(module); - setPanel(SVG::load(asset::plugin(plugin, "res/VCO-1.svg"))); + setPanel(SVG::load(asset::plugin(pluginInstance, "res/VCO-1.svg"))); addChild(createWidget(Vec(15, 0))); addChild(createWidget(Vec(box.size.x-30, 0))); @@ -340,7 +340,7 @@ struct VCO2 : Module { struct VCO2Widget : ModuleWidget { VCO2Widget(VCO2 *module) { setModule(module); - setPanel(SVG::load(asset::plugin(plugin, "res/VCO-2.svg"))); + setPanel(SVG::load(asset::plugin(pluginInstance, "res/VCO-2.svg"))); addChild(createWidget(Vec(15, 0))); addChild(createWidget(Vec(box.size.x-30, 0)));