From 5e7a2aa2ff889a64cc1d3ad5b1d39f974d33d8c4 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Thu, 15 Feb 2018 15:17:30 -0500 Subject: [PATCH] Fix names of Models --- src/8vert.cpp | 2 +- src/ADSR.cpp | 2 +- src/Delay.cpp | 2 +- src/Fundamental.cpp | 32 ++++++++++++++++---------------- src/Fundamental.hpp | 32 ++++++++++++++++---------------- src/LFO.cpp | 4 ++-- src/Mutes.cpp | 2 +- src/SEQ3.cpp | 2 +- src/Scope.cpp | 2 +- src/SequentialSwitch.cpp | 4 ++-- src/Unity.cpp | 2 +- src/VCA.cpp | 2 +- src/VCF.cpp | 2 +- src/VCMixer.cpp | 2 +- src/VCO.cpp | 4 ++-- 15 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/8vert.cpp b/src/8vert.cpp index 7777e2e..68beb81 100644 --- a/src/8vert.cpp +++ b/src/8vert.cpp @@ -81,4 +81,4 @@ _8vertWidget::_8vertWidget(_8vert *module) : ModuleWidget(module) { } -Model *model_8vertWidget = Model::create<_8vert, _8vertWidget>("Fundamental", "8vert", "8vert", ATTENUATOR_TAG); +Model *model_8vert = Model::create<_8vert, _8vertWidget>("Fundamental", "8vert", "8vert", ATTENUATOR_TAG); diff --git a/src/ADSR.cpp b/src/ADSR.cpp index 2bc6aca..4508721 100644 --- a/src/ADSR.cpp +++ b/src/ADSR.cpp @@ -135,4 +135,4 @@ ADSRWidget::ADSRWidget(ADSR *module) : ModuleWidget(module) { } -Model *modelADSRWidget = Model::create("Fundamental", "ADSR", "ADSR", ENVELOPE_GENERATOR_TAG); +Model *modelADSR = Model::create("Fundamental", "ADSR", "ADSR", ENVELOPE_GENERATOR_TAG); diff --git a/src/Delay.cpp b/src/Delay.cpp index 2c4c836..89a81bf 100644 --- a/src/Delay.cpp +++ b/src/Delay.cpp @@ -133,4 +133,4 @@ DelayWidget::DelayWidget(Delay *module) : ModuleWidget(module) { } -Model *modelDelayWidget = Model::create("Fundamental", "Delay", "Delay", DELAY_TAG); +Model *modelDelay = Model::create("Fundamental", "Delay", "Delay", DELAY_TAG); diff --git a/src/Fundamental.cpp b/src/Fundamental.cpp index 3b3b361..5df19a4 100644 --- a/src/Fundamental.cpp +++ b/src/Fundamental.cpp @@ -8,20 +8,20 @@ void init(rack::Plugin *p) { p->slug = TOSTRING(SLUG); p->version = TOSTRING(VERSION); - p->addModel(modelVCOWidget); - p->addModel(modelVCO2Widget); - p->addModel(modelVCFWidget); - p->addModel(modelVCAWidget); - p->addModel(modelLFOWidget); - p->addModel(modelLFO2Widget); - p->addModel(modelDelayWidget); - p->addModel(modelADSRWidget); - p->addModel(modelVCMixerWidget); - p->addModel(model_8vertWidget); - p->addModel(modelUnityWidget); - p->addModel(modelMutesWidget); - p->addModel(modelScopeWidget); - p->addModel(modelSEQ3Widget); - p->addModel(modelSequentialSwitch1Widget); - p->addModel(modelSequentialSwitch2Widget); + p->addModel(modelVCO); + p->addModel(modelVCO2); + p->addModel(modelVCF); + p->addModel(modelVCA); + p->addModel(modelLFO); + p->addModel(modelLFO2); + p->addModel(modelDelay); + p->addModel(modelADSR); + p->addModel(modelVCMixer); + p->addModel(model_8vert); + p->addModel(modelUnity); + p->addModel(modelMutes); + p->addModel(modelScope); + p->addModel(modelSEQ3); + p->addModel(modelSequentialSwitch1); + p->addModel(modelSequentialSwitch2); } diff --git a/src/Fundamental.hpp b/src/Fundamental.hpp index b4ebf59..4d63548 100644 --- a/src/Fundamental.hpp +++ b/src/Fundamental.hpp @@ -6,21 +6,21 @@ using namespace rack; extern Plugin *plugin; -extern Model *modelVCOWidget; -extern Model *modelVCO2Widget; -extern Model *modelVCFWidget; -extern Model *modelVCAWidget; -extern Model *modelLFOWidget; -extern Model *modelLFO2Widget; -extern Model *modelDelayWidget; -extern Model *modelADSRWidget; -extern Model *modelVCMixerWidget; -extern Model *model_8vertWidget; -extern Model *modelUnityWidget; -extern Model *modelMutesWidget; -extern Model *modelScopeWidget; -extern Model *modelSEQ3Widget; -extern Model *modelSequentialSwitch1Widget; -extern Model *modelSequentialSwitch2Widget; +extern Model *modelVCO; +extern Model *modelVCO2; +extern Model *modelVCF; +extern Model *modelVCA; +extern Model *modelLFO; +extern Model *modelLFO2; +extern Model *modelDelay; +extern Model *modelADSR; +extern Model *modelVCMixer; +extern Model *model_8vert; +extern Model *modelUnity; +extern Model *modelMutes; +extern Model *modelScope; +extern Model *modelSEQ3; +extern Model *modelSequentialSwitch1; +extern Model *modelSequentialSwitch2; diff --git a/src/LFO.cpp b/src/LFO.cpp index dc94c01..b15d233 100644 --- a/src/LFO.cpp +++ b/src/LFO.cpp @@ -155,7 +155,7 @@ LFOWidget::LFOWidget(LFO *module) : ModuleWidget(module) { } -Model *modelLFOWidget = Model::create("Fundamental", "LFO", "LFO-1", LFO_TAG); +Model *modelLFO = Model::create("Fundamental", "LFO", "LFO-1", LFO_TAG); struct LFO2 : Module { @@ -242,4 +242,4 @@ LFO2Widget::LFO2Widget(LFO2 *module) : ModuleWidget(module) { } -Model *modelLFO2Widget = Model::create("Fundamental", "LFO2", "LFO-2", LFO_TAG); +Model *modelLFO2 = Model::create("Fundamental", "LFO2", "LFO-2", LFO_TAG); diff --git a/src/Mutes.cpp b/src/Mutes.cpp index b7d7261..082aa34 100644 --- a/src/Mutes.cpp +++ b/src/Mutes.cpp @@ -145,4 +145,4 @@ MutesWidget::MutesWidget(Mutes *module) : ModuleWidget(module) { } -Model *modelMutesWidget = Model::create("Fundamental", "Mutes", "Mutes", SWITCH_TAG); +Model *modelMutes = Model::create("Fundamental", "Mutes", "Mutes", SWITCH_TAG); diff --git a/src/SEQ3.cpp b/src/SEQ3.cpp index da93f5f..8884d84 100644 --- a/src/SEQ3.cpp +++ b/src/SEQ3.cpp @@ -301,4 +301,4 @@ Menu *SEQ3Widget::createContextMenu() { } -Model *modelSEQ3Widget = Model::create("Fundamental", "SEQ3", "SEQ-3", SEQUENCER_TAG); +Model *modelSEQ3 = Model::create("Fundamental", "SEQ3", "SEQ-3", SEQUENCER_TAG); diff --git a/src/Scope.cpp b/src/Scope.cpp index 6bc0a9c..d6d5163 100644 --- a/src/Scope.cpp +++ b/src/Scope.cpp @@ -339,4 +339,4 @@ ScopeWidget::ScopeWidget(Scope *module) : ModuleWidget(module) { } -Model *modelScopeWidget = Model::create("Fundamental", "Scope", "Scope", VISUAL_TAG); +Model *modelScope = Model::create("Fundamental", "Scope", "Scope", VISUAL_TAG); diff --git a/src/SequentialSwitch.cpp b/src/SequentialSwitch.cpp index 0a1eb27..ad6aef2 100644 --- a/src/SequentialSwitch.cpp +++ b/src/SequentialSwitch.cpp @@ -104,7 +104,7 @@ SequentialSwitch1Widget::SequentialSwitch1Widget(SequentialSwitch<1> *module) : } -Model *modelSequentialSwitch1Widget = Model::create, SequentialSwitch1Widget>("Fundamental", "SequentialSwitch1", "Sequential Switch 1", UTILITY_TAG); +Model *modelSequentialSwitch1 = Model::create, SequentialSwitch1Widget>("Fundamental", "SequentialSwitch1", "Sequential Switch 1", UTILITY_TAG); struct SequentialSwitch2Widget : ModuleWidget { @@ -136,4 +136,4 @@ SequentialSwitch2Widget::SequentialSwitch2Widget(SequentialSwitch<2> *module) : } -Model *modelSequentialSwitch2Widget = Model::create, SequentialSwitch2Widget>("Fundamental", "SequentialSwitch2", "Sequential Switch 2", UTILITY_TAG); +Model *modelSequentialSwitch2 = Model::create, SequentialSwitch2Widget>("Fundamental", "SequentialSwitch2", "Sequential Switch 2", UTILITY_TAG); diff --git a/src/Unity.cpp b/src/Unity.cpp index ca87eac..6e0aa52 100644 --- a/src/Unity.cpp +++ b/src/Unity.cpp @@ -165,4 +165,4 @@ Menu *UnityWidget::createContextMenu() { } -Model *modelUnityWidget = Model::create("Fundamental", "Unity", "Unity", MIXER_TAG, UTILITY_TAG); +Model *modelUnity = Model::create("Fundamental", "Unity", "Unity", MIXER_TAG, UTILITY_TAG); diff --git a/src/VCA.cpp b/src/VCA.cpp index 4a186f1..6825032 100644 --- a/src/VCA.cpp +++ b/src/VCA.cpp @@ -70,4 +70,4 @@ VCAWidget::VCAWidget(VCA *module) : ModuleWidget(module) { } -Model *modelVCAWidget = Model::create("Fundamental", "VCA", "VCA", AMPLIFIER_TAG); +Model *modelVCA = Model::create("Fundamental", "VCA", "VCA", AMPLIFIER_TAG); diff --git a/src/VCF.cpp b/src/VCF.cpp index f2a3448..59170ba 100644 --- a/src/VCF.cpp +++ b/src/VCF.cpp @@ -172,4 +172,4 @@ VCFWidget::VCFWidget(VCF *module) : ModuleWidget(module) { } -Model *modelVCFWidget = Model::create("Fundamental", "VCF", "VCF", FILTER_TAG); +Model *modelVCF = Model::create("Fundamental", "VCF", "VCF", FILTER_TAG); diff --git a/src/VCMixer.cpp b/src/VCMixer.cpp index 596f9bd..1a0c848 100644 --- a/src/VCMixer.cpp +++ b/src/VCMixer.cpp @@ -78,4 +78,4 @@ VCMixerWidget::VCMixerWidget(VCMixer *module) : ModuleWidget(module) { } -Model *modelVCMixerWidget = Model::create("Fundamental", "VCMixer", "VC Mixer", MIXER_TAG, AMPLIFIER_TAG); +Model *modelVCMixer = Model::create("Fundamental", "VCMixer", "VC Mixer", MIXER_TAG, AMPLIFIER_TAG); diff --git a/src/VCO.cpp b/src/VCO.cpp index 07c5f32..93a9bf3 100644 --- a/src/VCO.cpp +++ b/src/VCO.cpp @@ -265,7 +265,7 @@ VCOWidget::VCOWidget(VCO *module) : ModuleWidget(module) { } -Model *modelVCOWidget = Model::create("Fundamental", "VCO", "VCO-1", OSCILLATOR_TAG); +Model *modelVCO = Model::create("Fundamental", "VCO", "VCO-1", OSCILLATOR_TAG); struct VCO2 : Module { @@ -355,7 +355,7 @@ VCO2Widget::VCO2Widget(VCO2 *module) : ModuleWidget(module) { } -Model *modelVCO2Widget = Model::create("Fundamental", "VCO2", "VCO-2", OSCILLATOR_TAG); +Model *modelVCO2 = Model::create("Fundamental", "VCO2", "VCO-2", OSCILLATOR_TAG); float sawTable[2048] = {