commit a48fa5945bca32d159a7385824fecf5c24ebd2b6 parent a564766a3b6d06776e33339ddd9394e2d634f7e8 Author: Matt Demanett <matt@demanett.net> Date: Sun, 19 May 2019 16:18:58 -0400 v1: SVG -> Svg; compiles without deprecation warnings. Diffstat:
65 files changed, 114 insertions(+), 114 deletions(-)
diff --git a/src/AD.cpp b/src/AD.cpp @@ -68,7 +68,7 @@ struct ADWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/AD.svg"))); addChild(panel); diff --git a/src/ADSR.cpp b/src/ADSR.cpp @@ -47,7 +47,7 @@ struct ADSRWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/ADSR.svg"))); addChild(panel); diff --git a/src/AMRM.cpp b/src/AMRM.cpp @@ -39,7 +39,7 @@ struct AMRMWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/AMRM.svg"))); addChild(panel); diff --git a/src/Additator.cpp b/src/Additator.cpp @@ -153,7 +153,7 @@ struct AdditatorWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Additator.svg"))); addChild(panel); diff --git a/src/AddrSeq.cpp b/src/AddrSeq.cpp @@ -81,7 +81,7 @@ struct AddrSeqWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/AddrSeq.svg"))); addChild(panel); diff --git a/src/Analyzer.cpp b/src/Analyzer.cpp @@ -109,7 +109,7 @@ struct AnalyzerWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - auto panel = new SVGPanel(); + auto panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Analyzer.svg"))); addChild(panel); diff --git a/src/AnalyzerXL.cpp b/src/AnalyzerXL.cpp @@ -247,7 +247,7 @@ struct AnalyzerXLWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/AnalyzerXL.svg"))); addChild(panel); diff --git a/src/Blank3.cpp b/src/Blank3.cpp @@ -72,7 +72,7 @@ struct Blank3Widget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Blank3.svg"))); addChild(panel); diff --git a/src/Blank6.cpp b/src/Blank6.cpp @@ -72,7 +72,7 @@ struct Blank6Widget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Blank6.svg"))); addChild(panel); diff --git a/src/Bool.cpp b/src/Bool.cpp @@ -19,7 +19,7 @@ struct BoolWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Bool.svg"))); addChild(panel); diff --git a/src/CVD.cpp b/src/CVD.cpp @@ -41,7 +41,7 @@ struct CVDWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/CVD.svg"))); addChild(panel); @@ -65,7 +65,7 @@ struct CVDWidget : ModuleWidget { addParam(createParam<Knob29>(timeParamPosition, module, CVD::TIME_PARAM)); { auto w = createParam<Knob16>(timeScaleParamPosition, module, CVD::TIME_SCALE_PARAM); - auto k = dynamic_cast<SVGKnob*>(w); + auto k = dynamic_cast<SvgKnob*>(w); k->snap = true; k->minAngle = -M_PI / 4.0f; k->maxAngle = M_PI / 4.0f; diff --git a/src/Clpr.cpp b/src/Clpr.cpp @@ -56,7 +56,7 @@ struct ClprWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Clpr.svg"))); addChild(panel); diff --git a/src/Cmp.cpp b/src/Cmp.cpp @@ -161,7 +161,7 @@ struct CmpWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Cmp.svg"))); addChild(panel); @@ -194,7 +194,7 @@ struct CmpWidget : ModuleWidget { addParam(createParam<Knob29>(lagParamPosition, module, Cmp::LAG_PARAM)); { auto w = createParam<Knob16>(outputParamPosition, module, Cmp::OUTPUT_PARAM); - auto k = dynamic_cast<SVGKnob*>(w); + auto k = dynamic_cast<SvgKnob*>(w); k->snap = true; k->minAngle = 3.0f * (M_PI / 8.0f); k->maxAngle = 5.0f * (M_PI / 8.0f); diff --git a/src/DADSRH.cpp b/src/DADSRH.cpp @@ -9,7 +9,7 @@ struct DADSRHWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/DADSRH.svg"))); addChild(panel); diff --git a/src/DADSRHPlus.cpp b/src/DADSRHPlus.cpp @@ -9,7 +9,7 @@ struct DADSRHPlusWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/DADSRHPlus.svg"))); addChild(panel); diff --git a/src/DGate.cpp b/src/DGate.cpp @@ -78,7 +78,7 @@ struct DGateWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/DGate.svg"))); addChild(panel); diff --git a/src/Detune.cpp b/src/Detune.cpp @@ -45,7 +45,7 @@ struct DetuneWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Detune.svg"))); addChild(panel); diff --git a/src/EightFO.cpp b/src/EightFO.cpp @@ -165,7 +165,7 @@ struct EightFOWidget : LFOBaseWidget { EightFOWidget(EightFO* module) : LFOBaseWidget( module, - new SVGPanel(), + new SvgPanel(), "res/EightFO-classic.svg", "res/EightFO.svg" ) { @@ -224,7 +224,7 @@ struct EightFOWidget : LFOBaseWidget { addParam(_frequencyKnob); { auto w = createParam<Knob16>(waveParamPosition, module, EightFO::WAVE_PARAM); - auto k = dynamic_cast<SVGKnob*>(w); + auto k = dynamic_cast<SvgKnob*>(w); k->snap = true; k->minAngle = 0.0; k->maxAngle = M_PI; @@ -273,7 +273,7 @@ struct EightFOWidget : LFOBaseWidget { void addPhaseParam(const Vec& position, Module* module, EightFO::ParamsIds paramId, float rotation) { auto w = createParam<Knob16>(position, module, paramId); - auto k = dynamic_cast<SVGKnob*>(w); + auto k = dynamic_cast<SvgKnob*>(w); k->minAngle += 0.5 * M_PI - rotation; k->maxAngle += 0.5 * M_PI - rotation; addParam(w); diff --git a/src/EightOne.cpp b/src/EightOne.cpp @@ -81,7 +81,7 @@ struct EightOneWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/EightOne.svg"))); addChild(panel); diff --git a/src/FMOp.cpp b/src/FMOp.cpp @@ -214,7 +214,7 @@ struct FMOpWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/FMOp.svg"))); addChild(panel); diff --git a/src/FlipFlop.cpp b/src/FlipFlop.cpp @@ -67,7 +67,7 @@ struct FlipFlopWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/FlipFlop.svg"))); addChild(panel); diff --git a/src/Follow.cpp b/src/Follow.cpp @@ -30,7 +30,7 @@ struct FollowWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Follow.svg"))); addChild(panel); diff --git a/src/LFO.cpp b/src/LFO.cpp @@ -107,7 +107,7 @@ struct LFOWidget : LFOBaseWidget { LFOWidget(LFO* module) : LFOBaseWidget( module, - new SVGPanel(), + new SvgPanel(), "res/LFO-classic.svg", "res/LFO.svg" ) { diff --git a/src/LLFO.cpp b/src/LLFO.cpp @@ -84,7 +84,7 @@ struct LLFOWidget : LFOBaseWidget { LLFOWidget(LLFO* module) : LFOBaseWidget( module, - new SVGPanel(), + new SvgPanel(), "res/LLFO-classic.svg", "res/LLFO.svg" ) { diff --git a/src/Lag.cpp b/src/Lag.cpp @@ -57,7 +57,7 @@ struct LagWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Lag.svg"))); addChild(panel); @@ -81,7 +81,7 @@ struct LagWidget : ModuleWidget { addParam(createParam<Knob29>(timeParamPosition, module, Lag::TIME_PARAM)); { auto w = createParam<Knob16>(timeScaleParamPosition, module, Lag::TIME_SCALE_PARAM); - auto k = dynamic_cast<SVGKnob*>(w); + auto k = dynamic_cast<SvgKnob*>(w); k->snap = true; k->minAngle = -M_PI / 4.0f; k->maxAngle = M_PI / 4.0f; diff --git a/src/Lmtr.cpp b/src/Lmtr.cpp @@ -72,7 +72,7 @@ struct LmtrWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Lmtr.svg"))); addChild(panel); diff --git a/src/Manual.cpp b/src/Manual.cpp @@ -37,7 +37,7 @@ struct ManualWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Manual.svg"))); addChild(panel); diff --git a/src/Matrix88.cpp b/src/Matrix88.cpp @@ -20,7 +20,7 @@ struct Matrix88Widget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Matrix88.svg"))); addChild(panel); diff --git a/src/Mix1.cpp b/src/Mix1.cpp @@ -18,7 +18,7 @@ struct Mix1Widget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Mix1.svg"))); addChild(panel); diff --git a/src/Mix4.cpp b/src/Mix4.cpp @@ -75,7 +75,7 @@ struct Mix4Widget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Mix4.svg"))); addChild(panel); diff --git a/src/Mix8.cpp b/src/Mix8.cpp @@ -99,7 +99,7 @@ struct Mix8Widget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Mix8.svg"))); addChild(panel); diff --git a/src/Mult.cpp b/src/Mult.cpp @@ -23,7 +23,7 @@ struct MultWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Mult.svg"))); addChild(panel); diff --git a/src/Mute8.cpp b/src/Mute8.cpp @@ -51,7 +51,7 @@ struct Mute8Widget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Mute8.svg"))); addChild(panel); diff --git a/src/Noise.cpp b/src/Noise.cpp @@ -36,7 +36,7 @@ struct NoiseWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Noise.svg"))); addChild(panel); diff --git a/src/Nsgt.cpp b/src/Nsgt.cpp @@ -76,7 +76,7 @@ struct NsgtWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Nsgt.svg"))); addChild(panel); diff --git a/src/Offset.cpp b/src/Offset.cpp @@ -31,7 +31,7 @@ struct OffsetWidget : DisableOutputLimitModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Offset.svg"))); addChild(panel); diff --git a/src/OneEight.cpp b/src/OneEight.cpp @@ -80,7 +80,7 @@ struct OneEightWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/OneEight.svg"))); addChild(panel); diff --git a/src/Pan.cpp b/src/Pan.cpp @@ -40,7 +40,7 @@ struct PanWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Pan.svg"))); addChild(panel); diff --git a/src/Pressor.cpp b/src/Pressor.cpp @@ -177,7 +177,7 @@ struct PressorWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Pressor.svg"))); addChild(panel); diff --git a/src/Reftone.cpp b/src/Reftone.cpp @@ -191,7 +191,7 @@ struct ReftoneWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Reftone.svg"))); addChild(panel); diff --git a/src/SampleHold.cpp b/src/SampleHold.cpp @@ -46,7 +46,7 @@ struct SampleHoldWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/SampleHold.svg"))); addChild(panel); diff --git a/src/Shaper.cpp b/src/Shaper.cpp @@ -9,7 +9,7 @@ struct ShaperWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Shaper.svg"))); addChild(panel); diff --git a/src/ShaperPlus.cpp b/src/ShaperPlus.cpp @@ -9,7 +9,7 @@ struct ShaperPlusWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/ShaperPlus.svg"))); addChild(panel); diff --git a/src/Slew.cpp b/src/Slew.cpp @@ -68,7 +68,7 @@ struct SlewWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Slew.svg"))); addChild(panel); diff --git a/src/Stack.cpp b/src/Stack.cpp @@ -47,7 +47,7 @@ struct StackWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Stack.svg"))); addChild(panel); @@ -78,7 +78,7 @@ struct StackWidget : ModuleWidget { } { auto w = createParam<Knob16>(octaveParamPosition, module, Stack::OCTAVE_PARAM); - auto k = dynamic_cast<SVGKnob*>(w); + auto k = dynamic_cast<SvgKnob*>(w); k->snap = true; k->minAngle = -0.5 * M_PI; k->maxAngle = 0.5 * M_PI; diff --git a/src/Sums.cpp b/src/Sums.cpp @@ -39,7 +39,7 @@ struct SumsWidget : DisableOutputLimitModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Sums.svg"))); addChild(panel); diff --git a/src/Switch.cpp b/src/Switch.cpp @@ -37,7 +37,7 @@ struct SwitchWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Switch.svg"))); addChild(panel); diff --git a/src/Test.cpp b/src/Test.cpp @@ -488,7 +488,7 @@ struct TestWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * 3, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Test.svg"))); addChild(panel); diff --git a/src/Test2.cpp b/src/Test2.cpp @@ -110,7 +110,7 @@ struct Test2Widget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * 6, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Test2.svg"))); addChild(panel); diff --git a/src/UMix.cpp b/src/UMix.cpp @@ -109,7 +109,7 @@ struct UMixWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/UMix.svg"))); addChild(panel); diff --git a/src/VCA.cpp b/src/VCA.cpp @@ -41,7 +41,7 @@ struct VCAWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/VCA.svg"))); addChild(panel); diff --git a/src/VCAmp.cpp b/src/VCAmp.cpp @@ -33,7 +33,7 @@ struct VCAmpWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/VCAmp.svg"))); addChild(panel); diff --git a/src/VCM.cpp b/src/VCM.cpp @@ -45,7 +45,7 @@ struct VCMWidget : DisableOutputLimitModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/VCM.svg"))); addChild(panel); diff --git a/src/VCO.cpp b/src/VCO.cpp @@ -160,7 +160,7 @@ struct VCOWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/VCO.svg"))); addChild(panel); diff --git a/src/VU.cpp b/src/VU.cpp @@ -97,7 +97,7 @@ struct VUWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/VU.svg"))); addChild(panel); diff --git a/src/Walk.cpp b/src/Walk.cpp @@ -53,7 +53,7 @@ struct WalkWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Walk.svg"))); addChild(panel); diff --git a/src/Walk2.cpp b/src/Walk2.cpp @@ -481,7 +481,7 @@ struct Walk2Widget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Walk2.svg"))); addChild(panel); diff --git a/src/XCO.cpp b/src/XCO.cpp @@ -262,7 +262,7 @@ struct XCOWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/XCO.svg"))); addChild(panel); diff --git a/src/XFade.cpp b/src/XFade.cpp @@ -44,7 +44,7 @@ struct XFadeWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/XFade.svg"))); addChild(panel); @@ -70,7 +70,7 @@ struct XFadeWidget : ModuleWidget { addParam(createParam<Knob29>(mixParamPosition, module, XFade::MIX_PARAM)); { auto w = createParam<Knob16>(curveParamPosition, module, XFade::CURVE_PARAM); - auto k = dynamic_cast<SVGKnob*>(w); + auto k = dynamic_cast<SvgKnob*>(w); k->minAngle = -0.5 * M_PI; k->maxAngle = 0.5 * M_PI; addParam(w); diff --git a/src/lfo_base.hpp b/src/lfo_base.hpp @@ -59,33 +59,33 @@ struct PitchModeMenuItem : MenuItem { struct LFOBaseWidget : ModuleWidget, PitchModeListener { LFOBase* _module; - SVGPanel* _panel; - const char* _classicSVGName; - const char* _compliantSVGName; - SVGKnob* _frequencyKnob = NULL; + SvgPanel* _panel; + const char* _classicSvgName; + const char* _compliantSvgName; + SvgKnob* _frequencyKnob = NULL; LFOBaseWidget( LFOBase* module, - SVGPanel* panel, - const char* classicSVGName, - const char* compliantSVGName + SvgPanel* panel, + const char* classicSvgName, + const char* compliantSvgName ) : _module(module) , _panel(panel) - , _classicSVGName(classicSVGName) - , _compliantSVGName(compliantSVGName) + , _classicSvgName(classicSvgName) + , _compliantSvgName(compliantSvgName) { setModule(module); - setSVG(); + setSvg(); if (_module) { _module->setPitchModeListener(this); } } - void setSVG() { + void setSvg() { // FIXME.v1 if (_module && !_module->isCompliantPitchMode()) { - _panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, _classicSVGName))); + _panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, _classicSvgName))); // if (_frequencyKnob) { // _frequencyKnob->minValue = -8.0f; // _frequencyKnob->maxValue = 5.0f; @@ -93,7 +93,7 @@ struct LFOBaseWidget : ModuleWidget, PitchModeListener { // } } else { - _panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, _compliantSVGName))); + _panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, _compliantSvgName))); // if (_frequencyKnob) { // _frequencyKnob->minValue = -5.0f; // _frequencyKnob->maxValue = 8.0f; @@ -104,7 +104,7 @@ struct LFOBaseWidget : ModuleWidget, PitchModeListener { } void pitchModeChanged() override { - setSVG(); + setSvg(); } void appendContextMenu(Menu* menu) override { diff --git a/src/mixer.cpp b/src/mixer.cpp @@ -53,7 +53,7 @@ SoloMuteButton::SoloMuteButton() { shadow = new CircularShadow(); addChild(shadow); - _svgWidget = new SVGWidget(); + _svgWidget = new SvgWidget(); addChild(_svgWidget); auto svg = APP->window->loadSvg(asset::plugin(pluginInstance, "res/button_18px_0.svg")); @@ -62,7 +62,7 @@ SoloMuteButton::SoloMuteButton() { _frames.push_back(APP->window->loadSvg(asset::plugin(pluginInstance, "res/button_18px_1_green.svg"))); _frames.push_back(APP->window->loadSvg(asset::plugin(pluginInstance, "res/button_18px_1_green.svg"))); - _svgWidget->setSVG(svg); + _svgWidget->setSvg(svg); box.size = _svgWidget->box.size; shadow->box.size = _svgWidget->box.size; shadow->blurRadius = 1.0; @@ -98,7 +98,7 @@ void SoloMuteButton::onChange(const event::Change& e) { // FIXME.v1 // assert(_frames.size() == 4); // assert(value >= 0.0f && value <= 3.0f); - // _svgWidget->setSVG(_frames[(int)value]); + // _svgWidget->setSvg(_frames[(int)value]); // dirty = true; ParamWidget::onChange(e); } diff --git a/src/mixer.hpp b/src/mixer.hpp @@ -66,8 +66,8 @@ struct MuteButton : ToggleButton { }; struct SoloMuteButton : ParamWidget /*FIXME.v1 , FramebufferWidget*/ { - std::vector<std::shared_ptr<SVG>> _frames; - SVGWidget* _svgWidget; // deleted elsewhere. + std::vector<std::shared_ptr<Svg>> _frames; + SvgWidget* _svgWidget; // deleted elsewhere. CircularShadow* shadow = NULL; SoloMuteButton(); diff --git a/src/template_panels.cpp b/src/template_panels.cpp @@ -7,7 +7,7 @@ struct ThreeHPWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * 3, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/ThreeHP.svg"))); addChild(panel); @@ -27,7 +27,7 @@ struct SixHPWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * 6, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/SixHP.svg"))); addChild(panel); @@ -47,7 +47,7 @@ struct EightHPWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * 8, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/EightHP.svg"))); addChild(panel); @@ -67,7 +67,7 @@ struct TenHPWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * 10, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/TenHP.svg"))); addChild(panel); @@ -89,7 +89,7 @@ struct TwelveHPWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * 12, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/TwelveHP.svg"))); addChild(panel); @@ -110,7 +110,7 @@ struct ThirteenHPWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * 13, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/ThirteenHP.svg"))); addChild(panel); @@ -132,7 +132,7 @@ struct FifteenHPWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * 15, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/FifteenHP.svg"))); addChild(panel); @@ -154,7 +154,7 @@ struct EighteenHPWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * 18, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/EighteenHP.svg"))); addChild(panel); @@ -176,7 +176,7 @@ struct TwentyHPWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * 20, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/TwentyHP.svg"))); addChild(panel); @@ -198,7 +198,7 @@ struct TwentyTwoHPWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * 22, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/TwentyTwoHP.svg"))); addChild(panel); @@ -220,7 +220,7 @@ struct TwentyFiveHPWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * 25, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/TwentyFiveHP.svg"))); addChild(panel); @@ -242,7 +242,7 @@ struct ThirtyHPWidget : ModuleWidget { box.size = Vec(RACK_GRID_WIDTH * 30, RACK_GRID_HEIGHT); { - SVGPanel *panel = new SVGPanel(); + SvgPanel *panel = new SvgPanel(); panel->box.size = box.size; panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/ThirtyHP.svg"))); addChild(panel); diff --git a/src/widgets.cpp b/src/widgets.cpp @@ -13,7 +13,7 @@ Button18::Button18() { BGKnob::BGKnob(const char* svg, int dim) { - setSVG(APP->window->loadSvg(asset::plugin(pluginInstance, svg))); + setSvg(APP->window->loadSvg(asset::plugin(pluginInstance, svg))); box.size = Vec(dim, dim); shadow->blurRadius = 2.0; // k->shadow->opacity = 0.15; @@ -53,7 +53,7 @@ Knob68::Knob68() : BGKnob("res/knob_68px.svg", 68) { Port24::Port24() { - setSVG(APP->window->loadSvg(asset::plugin(pluginInstance, "res/port.svg"))); + setSvg(APP->window->loadSvg(asset::plugin(pluginInstance, "res/port.svg"))); box.size = Vec(24, 24); shadow->blurRadius = 1.0; shadow->box.pos = Vec(0.0, 1.5); @@ -61,7 +61,7 @@ Port24::Port24() { BlankPort24::BlankPort24() { - setSVG(NULL); + setSvg(NULL); box.size = Vec(24, 24); } @@ -82,18 +82,18 @@ SliderSwitch2State14::SliderSwitch2State14() { } -StatefulButton::StatefulButton(const char* offSVGPath, const char* onSVGPath) { +StatefulButton::StatefulButton(const char* offSvgPath, const char* onSvgPath) { shadow = new CircularShadow(); addChild(shadow); - _svgWidget = new SVGWidget(); + _svgWidget = new SvgWidget(); addChild(_svgWidget); - auto svg = APP->window->loadSvg(asset::plugin(pluginInstance, offSVGPath)); + auto svg = APP->window->loadSvg(asset::plugin(pluginInstance, offSvgPath)); _frames.push_back(svg); - _frames.push_back(APP->window->loadSvg(asset::plugin(pluginInstance, onSVGPath))); + _frames.push_back(APP->window->loadSvg(asset::plugin(pluginInstance, onSvgPath))); - _svgWidget->setSVG(svg); + _svgWidget->setSvg(svg); box.size = _svgWidget->box.size; shadow->box.size = _svgWidget->box.size; shadow->blurRadius = 1.0; @@ -105,7 +105,7 @@ void StatefulButton::step() { } void StatefulButton::onDragStart(const event::DragStart& e) { - _svgWidget->setSVG(_frames[1]); + _svgWidget->setSvg(_frames[1]); // FIXME.v1 // dirty = true; // @@ -118,7 +118,7 @@ void StatefulButton::onDragStart(const event::DragStart& e) { } void StatefulButton::onDragEnd(const event::DragEnd& e) { - _svgWidget->setSVG(_frames[0]); + _svgWidget->setSvg(_frames[0]); // FIXME.v1 dirty = true; } diff --git a/src/widgets.hpp b/src/widgets.hpp @@ -8,7 +8,7 @@ namespace bogaudio { // FIXME.v1: all of this. -struct Button18 : SVGSwitch /*, MomentarySwitch*/ { +struct Button18 : SvgSwitch /*, MomentarySwitch*/ { Button18(); }; @@ -44,7 +44,7 @@ struct Knob68 : BGKnob { Knob68(); }; -struct Port24 : SVGPort { +struct Port24 : SvgPort { Port24(); }; @@ -52,7 +52,7 @@ struct BlankPort24 : Port24 { BlankPort24(); }; -struct SliderSwitch : SVGSwitch /*, ToggleSwitch*/ { +struct SliderSwitch : SvgSwitch /*, ToggleSwitch*/ { CircularShadow* shadow = NULL; SliderSwitch(); }; @@ -62,11 +62,11 @@ struct SliderSwitch2State14 : SliderSwitch { }; struct StatefulButton : ParamWidget /*, FramebufferWidget*/ { - std::vector<std::shared_ptr<SVG>> _frames; - SVGWidget* _svgWidget; // deleted elsewhere. + std::vector<std::shared_ptr<Svg>> _frames; + SvgWidget* _svgWidget; // deleted elsewhere. CircularShadow* shadow = NULL; - StatefulButton(const char* offSVGPath, const char* onSVGPath); + StatefulButton(const char* offSvgPath, const char* onSvgPath); void step() override; void onDragStart(const event::DragStart& e) override; void onDragEnd(const event::DragEnd& e) override; @@ -80,7 +80,7 @@ struct StatefulButton18 : StatefulButton { StatefulButton18(); }; -struct ToggleButton : SVGSwitch /*, ToggleSwitch*/ { +struct ToggleButton : SvgSwitch /*, ToggleSwitch*/ { }; struct ToggleButton18 : ToggleButton {