VCVRack
/
Fundamental
mirror of https://github.com/VCVRack/Fundamental.git
1
0
Fork 0
Code Issues 0 Releases 28 Wiki Activity
Browse Source

Rename plugin variable to avoid name collision

tags/v1.0.1
Andrew Belt 6 years ago
parent
fba42201f4
commit
0a0cde9657
14 changed files with 20 additions and 20 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      src/8vert.cpp
  2. +1
    -1
      src/ADSR.cpp
  3. +1
    -1
      src/Delay.cpp
  4. +2
    -2
      src/Fundamental.cpp
  5. +2
    -2
      src/LFO.cpp
  6. +1
    -1
      src/Mutes.cpp
  7. +1
    -1
      src/SEQ3.cpp
  8. +2
    -2
      src/Scope.cpp
  9. +2
    -2
      src/SequentialSwitch.cpp
  10. +1
    -1
      src/Unity.cpp
  11. +2
    -2
      src/VCA.cpp
  12. +1
    -1
      src/VCF.cpp
  13. +1
    -1
      src/VCMixer.cpp
  14. +2
    -2
      src/VCO.cpp

+ 1
- 1
src/8vert.cpp View File

@@ -42,7 +42,7 @@ struct _8vert : Module {
struct _8vertWidget : ModuleWidget { struct _8vertWidget : ModuleWidget {
_8vertWidget(_8vert *module) { _8vertWidget(_8vert *module) {
setModule(module); setModule(module);
setPanel(SVG::load(asset::plugin(plugin, "res/8vert.svg")));
setPanel(SVG::load(asset::plugin(pluginInstance, "res/8vert.svg")));


addChild(createWidget<ScrewSilver>(Vec(15, 0))); addChild(createWidget<ScrewSilver>(Vec(15, 0)));
addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0))); addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0)));


+ 1
- 1
src/ADSR.cpp View File

@@ -108,7 +108,7 @@ struct ADSR : Module {
struct ADSRWidget : ModuleWidget { struct ADSRWidget : ModuleWidget {
ADSRWidget(ADSR *module) { ADSRWidget(ADSR *module) {
setModule(module); setModule(module);
setPanel(SVG::load(asset::plugin(plugin, "res/ADSR.svg")));
setPanel(SVG::load(asset::plugin(pluginInstance, "res/ADSR.svg")));


addChild(createWidget<ScrewSilver>(Vec(15, 0))); addChild(createWidget<ScrewSilver>(Vec(15, 0)));
addChild(createWidget<ScrewSilver>(Vec(box.size.x-30, 0))); addChild(createWidget<ScrewSilver>(Vec(box.size.x-30, 0)));


+ 1
- 1
src/Delay.cpp View File

@@ -113,7 +113,7 @@ struct Delay : Module {
struct DelayWidget : ModuleWidget { struct DelayWidget : ModuleWidget {
DelayWidget(Delay *module) { DelayWidget(Delay *module) {
setModule(module); setModule(module);
setPanel(SVG::load(asset::plugin(plugin, "res/Delay.svg")));
setPanel(SVG::load(asset::plugin(pluginInstance, "res/Delay.svg")));


addChild(createWidget<ScrewSilver>(Vec(15, 0))); addChild(createWidget<ScrewSilver>(Vec(15, 0)));
addChild(createWidget<ScrewSilver>(Vec(box.size.x-30, 0))); addChild(createWidget<ScrewSilver>(Vec(box.size.x-30, 0)));


+ 2
- 2
src/Fundamental.cpp View File

@@ -1,10 +1,10 @@
#include "Fundamental.hpp" #include "Fundamental.hpp"




Plugin *plugin;
Plugin *pluginInstance;


void init(rack::Plugin *p) { void init(rack::Plugin *p) {
plugin = p;
pluginInstance = p;


p->addModel(modelVCO); p->addModel(modelVCO);
p->addModel(modelVCO2); p->addModel(modelVCO2);


+ 2
- 2
src/LFO.cpp View File

@@ -131,7 +131,7 @@ struct LFO : Module {
struct LFOWidget : ModuleWidget { struct LFOWidget : ModuleWidget {
LFOWidget(LFO *module) { LFOWidget(LFO *module) {
setModule(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<ScrewSilver>(Vec(15, 0))); addChild(createWidget<ScrewSilver>(Vec(15, 0)));
addChild(createWidget<ScrewSilver>(Vec(box.size.x-30, 0))); addChild(createWidget<ScrewSilver>(Vec(box.size.x-30, 0)));
@@ -228,7 +228,7 @@ struct LFO2 : Module {
struct LFO2Widget : ModuleWidget { struct LFO2Widget : ModuleWidget {
LFO2Widget(LFO2 *module) { LFO2Widget(LFO2 *module) {
setModule(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<ScrewSilver>(Vec(15, 0))); addChild(createWidget<ScrewSilver>(Vec(15, 0)));
addChild(createWidget<ScrewSilver>(Vec(box.size.x-30, 0))); addChild(createWidget<ScrewSilver>(Vec(box.size.x-30, 0)));


+ 1
- 1
src/Mutes.cpp View File

@@ -94,7 +94,7 @@ struct MuteLight : BASE {
struct MutesWidget : ModuleWidget { struct MutesWidget : ModuleWidget {
MutesWidget(Mutes *module) { MutesWidget(Mutes *module) {
setModule(module); setModule(module);
setPanel(SVG::load(asset::plugin(plugin, "res/Mutes.svg")));
setPanel(SVG::load(asset::plugin(pluginInstance, "res/Mutes.svg")));


addChild(createWidget<ScrewSilver>(Vec(15, 0))); addChild(createWidget<ScrewSilver>(Vec(15, 0)));
addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0))); addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0)));


+ 1
- 1
src/SEQ3.cpp View File

@@ -175,7 +175,7 @@ struct SEQ3 : Module {
struct SEQ3Widget : ModuleWidget { struct SEQ3Widget : ModuleWidget {
SEQ3Widget(SEQ3 *module) { SEQ3Widget(SEQ3 *module) {
setModule(module); setModule(module);
setPanel(SVG::load(asset::plugin(plugin, "res/SEQ3.svg")));
setPanel(SVG::load(asset::plugin(pluginInstance, "res/SEQ3.svg")));


addChild(createWidget<ScrewSilver>(Vec(15, 0))); addChild(createWidget<ScrewSilver>(Vec(15, 0)));
addChild(createWidget<ScrewSilver>(Vec(box.size.x-30, 0))); addChild(createWidget<ScrewSilver>(Vec(box.size.x-30, 0)));


+ 2
- 2
src/Scope.cpp View File

@@ -164,7 +164,7 @@ struct ScopeDisplay : TransparentWidget {
Stats statsX, statsY; Stats statsX, statsY;


ScopeDisplay() { 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) { void drawWaveform(const DrawContext &ctx, float *valuesX, float *valuesY) {
@@ -313,7 +313,7 @@ struct ScopeDisplay : TransparentWidget {
struct ScopeWidget : ModuleWidget { struct ScopeWidget : ModuleWidget {
ScopeWidget(Scope *module) { ScopeWidget(Scope *module) {
setModule(module); setModule(module);
setPanel(SVG::load(asset::plugin(plugin, "res/Scope.svg")));
setPanel(SVG::load(asset::plugin(pluginInstance, "res/Scope.svg")));


addChild(createWidget<ScrewSilver>(Vec(15, 0))); addChild(createWidget<ScrewSilver>(Vec(15, 0)));
addChild(createWidget<ScrewSilver>(Vec(box.size.x-30, 0))); addChild(createWidget<ScrewSilver>(Vec(box.size.x-30, 0)));


+ 2
- 2
src/SequentialSwitch.cpp View File

@@ -81,7 +81,7 @@ struct SequentialSwitch1Widget : ModuleWidget {


SequentialSwitch1Widget(SequentialSwitch<1> *module) { SequentialSwitch1Widget(SequentialSwitch<1> *module) {
setModule(module); setModule(module);
setPanel(SVG::load(asset::plugin(plugin, "res/SequentialSwitch1.svg")));
setPanel(SVG::load(asset::plugin(pluginInstance, "res/SequentialSwitch1.svg")));


addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0))); addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0)));
addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH))); addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
@@ -113,7 +113,7 @@ struct SequentialSwitch2Widget : ModuleWidget {


SequentialSwitch2Widget(SequentialSwitch<2> *module) { SequentialSwitch2Widget(SequentialSwitch<2> *module) {
setModule(module); setModule(module);
setPanel(SVG::load(asset::plugin(plugin, "res/SequentialSwitch2.svg")));
setPanel(SVG::load(asset::plugin(pluginInstance, "res/SequentialSwitch2.svg")));


addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0))); addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0)));
addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH))); addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));


+ 1
- 1
src/Unity.cpp View File

@@ -106,7 +106,7 @@ struct UnityMergeItem : MenuItem {
struct UnityWidget : ModuleWidget { struct UnityWidget : ModuleWidget {
UnityWidget(Unity *module) { UnityWidget(Unity *module) {
setModule(module); setModule(module);
setPanel(SVG::load(asset::plugin(plugin, "res/Unity.svg")));
setPanel(SVG::load(asset::plugin(pluginInstance, "res/Unity.svg")));


addChild(createWidget<ScrewSilver>(Vec(15, 0))); addChild(createWidget<ScrewSilver>(Vec(15, 0)));
addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0))); addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0)));


+ 2
- 2
src/VCA.cpp View File

@@ -49,7 +49,7 @@ struct VCA : Module {
struct VCAWidget : ModuleWidget { struct VCAWidget : ModuleWidget {
VCAWidget(VCA *module) { VCAWidget(VCA *module) {
setModule(module); setModule(module);
setPanel(SVG::load(asset::plugin(plugin, "res/VCA.svg")));
setPanel(SVG::load(asset::plugin(pluginInstance, "res/VCA.svg")));


addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0))); addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0)));
addChild(createWidget<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0))); addChild(createWidget<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0)));
@@ -155,7 +155,7 @@ struct VCA_1VUKnob : SliderKnob {
struct VCA_1Widget : ModuleWidget { struct VCA_1Widget : ModuleWidget {
VCA_1Widget(VCA_1 *module) { VCA_1Widget(VCA_1 *module) {
setModule(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<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0))); addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0)));
addChild(createWidget<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0))); addChild(createWidget<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0)));


+ 1
- 1
src/VCF.cpp View File

@@ -152,7 +152,7 @@ struct VCF : Module {
struct VCFWidget : ModuleWidget { struct VCFWidget : ModuleWidget {
VCFWidget(VCF *module) { VCFWidget(VCF *module) {
setModule(module); setModule(module);
setPanel(SVG::load(asset::plugin(plugin, "res/VCF.svg")));
setPanel(SVG::load(asset::plugin(pluginInstance, "res/VCF.svg")));


addChild(createWidget<ScrewSilver>(Vec(15, 0))); addChild(createWidget<ScrewSilver>(Vec(15, 0)));
addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0))); addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0)));


+ 1
- 1
src/VCMixer.cpp View File

@@ -49,7 +49,7 @@ struct VCMixer : Module {
struct VCMixerWidget : ModuleWidget { struct VCMixerWidget : ModuleWidget {
VCMixerWidget(VCMixer *module) { VCMixerWidget(VCMixer *module) {
setModule(module); setModule(module);
setPanel(SVG::load(asset::plugin(plugin, "res/VCMixer.svg")));
setPanel(SVG::load(asset::plugin(pluginInstance, "res/VCMixer.svg")));


addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0))); addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0)));
addChild(createWidget<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0))); addChild(createWidget<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0)));


+ 2
- 2
src/VCO.cpp View File

@@ -238,7 +238,7 @@ struct VCO : Module {
struct VCOWidget : ModuleWidget { struct VCOWidget : ModuleWidget {
VCOWidget(VCO *module) { VCOWidget(VCO *module) {
setModule(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<ScrewSilver>(Vec(15, 0))); addChild(createWidget<ScrewSilver>(Vec(15, 0)));
addChild(createWidget<ScrewSilver>(Vec(box.size.x-30, 0))); addChild(createWidget<ScrewSilver>(Vec(box.size.x-30, 0)));
@@ -340,7 +340,7 @@ struct VCO2 : Module {
struct VCO2Widget : ModuleWidget { struct VCO2Widget : ModuleWidget {
VCO2Widget(VCO2 *module) { VCO2Widget(VCO2 *module) {
setModule(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<ScrewSilver>(Vec(15, 0))); addChild(createWidget<ScrewSilver>(Vec(15, 0)));
addChild(createWidget<ScrewSilver>(Vec(box.size.x-30, 0))); addChild(createWidget<ScrewSilver>(Vec(box.size.x-30, 0)));


Write Preview
Loading…
Cancel
Save