commit bbe5e818dc104fc775b6159dccb773d075cbef9f parent b2c8000ff28b4346c809240b1c272ebb333082d9 Author: Matt Demanett <matt@demanett.net> Date: Sat, 18 May 2019 18:43:57 -0400 v1: APP->window->load(Font|Svg). Diffstat:
64 files changed, 95 insertions(+), 95 deletions(-)
diff --git a/src/AD.cpp b/src/AD.cpp @@ -69,7 +69,7 @@ struct ADWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/AD.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/AD.svg"))); addChild(panel); } diff --git a/src/ADSR.cpp b/src/ADSR.cpp @@ -48,7 +48,7 @@ struct ADSRWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/ADSR.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/ADSR.svg"))); addChild(panel); } diff --git a/src/AMRM.cpp b/src/AMRM.cpp @@ -40,7 +40,7 @@ struct AMRMWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/AMRM.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/AMRM.svg"))); addChild(panel); } diff --git a/src/Additator.cpp b/src/Additator.cpp @@ -165,7 +165,7 @@ struct AdditatorWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Additator.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Additator.svg"))); addChild(panel); } diff --git a/src/AddrSeq.cpp b/src/AddrSeq.cpp @@ -82,7 +82,7 @@ struct AddrSeqWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/AddrSeq.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/AddrSeq.svg"))); addChild(panel); } diff --git a/src/Analyzer.cpp b/src/Analyzer.cpp @@ -110,7 +110,7 @@ struct AnalyzerWidget : ModuleWidget { { auto panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Analyzer.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Analyzer.svg"))); addChild(panel); } diff --git a/src/AnalyzerXL.cpp b/src/AnalyzerXL.cpp @@ -248,7 +248,7 @@ struct AnalyzerXLWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/AnalyzerXL.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/AnalyzerXL.svg"))); addChild(panel); } diff --git a/src/Blank3.cpp b/src/Blank3.cpp @@ -25,7 +25,7 @@ struct Blank3Display : OpaqueWidget { Blank3Display(Blank3* module, const char* text) : _module(module) , _text(text) - , _font(Font::load(asset::plugin(pluginInstance, "res/fonts/audiowide.ttf"))) + , _font(APP->window->loadFont(asset::plugin(pluginInstance, "res/fonts/audiowide.ttf"))) { } @@ -73,7 +73,7 @@ struct Blank3Widget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Blank3.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Blank3.svg"))); addChild(panel); } diff --git a/src/Blank6.cpp b/src/Blank6.cpp @@ -25,7 +25,7 @@ struct Blank6Display : OpaqueWidget { Blank6Display(Blank6* module, const char* text) : _module(module) , _text(text) - , _font(Font::load(asset::plugin(pluginInstance, "res/fonts/audiowide.ttf"))) + , _font(APP->window->loadFont(asset::plugin(pluginInstance, "res/fonts/audiowide.ttf"))) { } @@ -73,7 +73,7 @@ struct Blank6Widget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Blank6.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Blank6.svg"))); addChild(panel); } diff --git a/src/Bool.cpp b/src/Bool.cpp @@ -20,7 +20,7 @@ struct BoolWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Bool.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Bool.svg"))); addChild(panel); } diff --git a/src/CVD.cpp b/src/CVD.cpp @@ -42,7 +42,7 @@ struct CVDWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/CVD.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/CVD.svg"))); addChild(panel); } diff --git a/src/Clpr.cpp b/src/Clpr.cpp @@ -57,7 +57,7 @@ struct ClprWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Clpr.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Clpr.svg"))); addChild(panel); } diff --git a/src/Cmp.cpp b/src/Cmp.cpp @@ -162,7 +162,7 @@ struct CmpWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Cmp.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Cmp.svg"))); addChild(panel); } diff --git a/src/DADSRH.cpp b/src/DADSRH.cpp @@ -10,7 +10,7 @@ struct DADSRHWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/DADSRH.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/DADSRH.svg"))); addChild(panel); } diff --git a/src/DADSRHPlus.cpp b/src/DADSRHPlus.cpp @@ -10,7 +10,7 @@ struct DADSRHPlusWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/DADSRHPlus.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/DADSRHPlus.svg"))); addChild(panel); } diff --git a/src/DGate.cpp b/src/DGate.cpp @@ -79,7 +79,7 @@ struct DGateWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/DGate.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/DGate.svg"))); addChild(panel); } diff --git a/src/Detune.cpp b/src/Detune.cpp @@ -46,7 +46,7 @@ struct DetuneWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Detune.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Detune.svg"))); addChild(panel); } diff --git a/src/EightFO.cpp b/src/EightFO.cpp @@ -166,8 +166,8 @@ struct EightFOWidget : LFOBaseWidget { : LFOBaseWidget( module, new SVGPanel(), - SVG::load(asset::plugin(pluginInstance, "res/EightFO-classic.svg")), - SVG::load(asset::plugin(pluginInstance, "res/EightFO.svg")) + APP->window->loadSvg(asset::plugin(pluginInstance, "res/EightFO-classic.svg")), + APP->window->loadSvg(asset::plugin(pluginInstance, "res/EightFO.svg")) ) { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); _panel->box.size = box.size; diff --git a/src/EightOne.cpp b/src/EightOne.cpp @@ -82,7 +82,7 @@ struct EightOneWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/EightOne.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/EightOne.svg"))); addChild(panel); } diff --git a/src/FMOp.cpp b/src/FMOp.cpp @@ -215,7 +215,7 @@ struct FMOpWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/FMOp.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/FMOp.svg"))); addChild(panel); } diff --git a/src/FlipFlop.cpp b/src/FlipFlop.cpp @@ -68,7 +68,7 @@ struct FlipFlopWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/FlipFlop.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/FlipFlop.svg"))); addChild(panel); } diff --git a/src/Follow.cpp b/src/Follow.cpp @@ -31,7 +31,7 @@ struct FollowWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Follow.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Follow.svg"))); addChild(panel); } diff --git a/src/LFO.cpp b/src/LFO.cpp @@ -108,8 +108,8 @@ struct LFOWidget : LFOBaseWidget { : LFOBaseWidget( module, new SVGPanel(), - SVG::load(asset::plugin(pluginInstance, "res/LFO-classic.svg")), - SVG::load(asset::plugin(pluginInstance, "res/LFO.svg")) + APP->window->loadSvg(asset::plugin(pluginInstance, "res/LFO-classic.svg")), + APP->window->loadSvg(asset::plugin(pluginInstance, "res/LFO.svg")) ) { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); _panel->box.size = box.size; diff --git a/src/LLFO.cpp b/src/LLFO.cpp @@ -85,8 +85,8 @@ struct LLFOWidget : LFOBaseWidget { : LFOBaseWidget( module, new SVGPanel(), - SVG::load(asset::plugin(pluginInstance, "res/LLFO-classic.svg")), - SVG::load(asset::plugin(pluginInstance, "res/LLFO.svg")) + APP->window->loadSvg(asset::plugin(pluginInstance, "res/LLFO-classic.svg")), + APP->window->loadSvg(asset::plugin(pluginInstance, "res/LLFO.svg")) ) { box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); _panel->box.size = box.size; diff --git a/src/Lag.cpp b/src/Lag.cpp @@ -58,7 +58,7 @@ struct LagWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Lag.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Lag.svg"))); addChild(panel); } diff --git a/src/Lmtr.cpp b/src/Lmtr.cpp @@ -73,7 +73,7 @@ struct LmtrWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Lmtr.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Lmtr.svg"))); addChild(panel); } diff --git a/src/Manual.cpp b/src/Manual.cpp @@ -38,7 +38,7 @@ struct ManualWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Manual.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Manual.svg"))); addChild(panel); } diff --git a/src/Matrix88.cpp b/src/Matrix88.cpp @@ -21,7 +21,7 @@ struct Matrix88Widget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Matrix88.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Matrix88.svg"))); addChild(panel); } diff --git a/src/Mix1.cpp b/src/Mix1.cpp @@ -19,7 +19,7 @@ struct Mix1Widget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Mix1.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Mix1.svg"))); addChild(panel); } diff --git a/src/Mix4.cpp b/src/Mix4.cpp @@ -76,7 +76,7 @@ struct Mix4Widget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Mix4.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Mix4.svg"))); addChild(panel); } diff --git a/src/Mix8.cpp b/src/Mix8.cpp @@ -100,7 +100,7 @@ struct Mix8Widget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Mix8.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Mix8.svg"))); addChild(panel); } diff --git a/src/Mult.cpp b/src/Mult.cpp @@ -24,7 +24,7 @@ struct MultWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Mult.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Mult.svg"))); addChild(panel); } diff --git a/src/Mute8.cpp b/src/Mute8.cpp @@ -52,7 +52,7 @@ struct Mute8Widget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Mute8.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Mute8.svg"))); addChild(panel); } diff --git a/src/Noise.cpp b/src/Noise.cpp @@ -37,7 +37,7 @@ struct NoiseWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Noise.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Noise.svg"))); addChild(panel); } diff --git a/src/Nsgt.cpp b/src/Nsgt.cpp @@ -77,7 +77,7 @@ struct NsgtWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Nsgt.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Nsgt.svg"))); addChild(panel); } diff --git a/src/Offset.cpp b/src/Offset.cpp @@ -33,7 +33,7 @@ struct OffsetWidget : DisableOutputLimitModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Offset.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Offset.svg"))); addChild(panel); } diff --git a/src/OneEight.cpp b/src/OneEight.cpp @@ -81,7 +81,7 @@ struct OneEightWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/OneEight.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/OneEight.svg"))); addChild(panel); } diff --git a/src/Pan.cpp b/src/Pan.cpp @@ -41,7 +41,7 @@ struct PanWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Pan.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Pan.svg"))); addChild(panel); } diff --git a/src/Pressor.cpp b/src/Pressor.cpp @@ -178,7 +178,7 @@ struct PressorWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Pressor.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Pressor.svg"))); addChild(panel); } diff --git a/src/Reftone.cpp b/src/Reftone.cpp @@ -47,7 +47,7 @@ struct ReftoneDisplay : TransparentWidget { ) : _module(module) , _size(size) - , _font(Font::load(asset::plugin(pluginInstance, "res/fonts/inconsolata-bold.ttf"))) + , _font(APP->window->loadFont(asset::plugin(pluginInstance, "res/fonts/inconsolata-bold.ttf"))) { } @@ -192,7 +192,7 @@ struct ReftoneWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Reftone.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Reftone.svg"))); addChild(panel); } diff --git a/src/SampleHold.cpp b/src/SampleHold.cpp @@ -47,7 +47,7 @@ struct SampleHoldWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/SampleHold.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/SampleHold.svg"))); addChild(panel); } diff --git a/src/Shaper.cpp b/src/Shaper.cpp @@ -10,7 +10,7 @@ struct ShaperWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Shaper.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Shaper.svg"))); addChild(panel); } diff --git a/src/ShaperPlus.cpp b/src/ShaperPlus.cpp @@ -10,7 +10,7 @@ struct ShaperPlusWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/ShaperPlus.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/ShaperPlus.svg"))); addChild(panel); } diff --git a/src/Slew.cpp b/src/Slew.cpp @@ -69,7 +69,7 @@ struct SlewWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Slew.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Slew.svg"))); addChild(panel); } diff --git a/src/Stack.cpp b/src/Stack.cpp @@ -48,7 +48,7 @@ struct StackWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Stack.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Stack.svg"))); addChild(panel); } diff --git a/src/Sums.cpp b/src/Sums.cpp @@ -41,7 +41,7 @@ struct SumsWidget : DisableOutputLimitModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Sums.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Sums.svg"))); addChild(panel); } diff --git a/src/Switch.cpp b/src/Switch.cpp @@ -38,7 +38,7 @@ struct SwitchWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Switch.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Switch.svg"))); addChild(panel); } diff --git a/src/Test.cpp b/src/Test.cpp @@ -489,7 +489,7 @@ struct TestWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Test.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Test.svg"))); addChild(panel); } diff --git a/src/Test2.cpp b/src/Test2.cpp @@ -111,7 +111,7 @@ struct Test2Widget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Test2.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Test2.svg"))); addChild(panel); } diff --git a/src/UMix.cpp b/src/UMix.cpp @@ -110,7 +110,7 @@ struct UMixWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/UMix.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/UMix.svg"))); addChild(panel); } diff --git a/src/VCA.cpp b/src/VCA.cpp @@ -42,7 +42,7 @@ struct VCAWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/VCA.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/VCA.svg"))); addChild(panel); } diff --git a/src/VCAmp.cpp b/src/VCAmp.cpp @@ -37,7 +37,7 @@ struct VCAmpWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/VCAmp.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/VCAmp.svg"))); addChild(panel); } diff --git a/src/VCM.cpp b/src/VCM.cpp @@ -47,7 +47,7 @@ struct VCMWidget : DisableOutputLimitModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/VCM.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/VCM.svg"))); addChild(panel); } diff --git a/src/VCO.cpp b/src/VCO.cpp @@ -161,7 +161,7 @@ struct VCOWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/VCO.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/VCO.svg"))); addChild(panel); } diff --git a/src/VU.cpp b/src/VU.cpp @@ -98,7 +98,7 @@ struct VUWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/VU.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/VU.svg"))); addChild(panel); } diff --git a/src/Walk.cpp b/src/Walk.cpp @@ -54,7 +54,7 @@ struct WalkWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Walk.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Walk.svg"))); addChild(panel); } diff --git a/src/Walk2.cpp b/src/Walk2.cpp @@ -141,7 +141,7 @@ struct Walk2Display : TransparentWidget { , _drawSize(2 * (_size.x - 2 * _insetAround), 2 * (_size.y - 2 * _insetAround)) , _midX(_insetAround + _drawSize.x/2) , _midY(_insetAround + _drawSize.y/2) - , _font(Font::load(asset::plugin(pluginInstance, "res/fonts/inconsolata.ttf"))) + , _font(APP->window->loadFont(asset::plugin(pluginInstance, "res/fonts/inconsolata.ttf"))) { } @@ -482,7 +482,7 @@ struct Walk2Widget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/Walk2.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Walk2.svg"))); addChild(panel); } diff --git a/src/XCO.cpp b/src/XCO.cpp @@ -263,7 +263,7 @@ struct XCOWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/XCO.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/XCO.svg"))); addChild(panel); } diff --git a/src/XFade.cpp b/src/XFade.cpp @@ -45,7 +45,7 @@ struct XFadeWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/XFade.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/XFade.svg"))); addChild(panel); } diff --git a/src/analyzer_base.hpp b/src/analyzer_base.hpp @@ -156,7 +156,7 @@ struct AnalyzerDisplay : TransparentWidget { , _size(size) , _graphSize(_size.x - _insetLeft - _insetRight, _size.y - _insetTop - _insetBottom) , _drawInset(drawInset) - , _font(Font::load(asset::plugin(pluginInstance, "res/fonts/inconsolata.ttf"))) + , _font(APP->window->loadFont(asset::plugin(pluginInstance, "res/fonts/inconsolata.ttf"))) { } diff --git a/src/mixer.cpp b/src/mixer.cpp @@ -56,11 +56,11 @@ SoloMuteButton::SoloMuteButton() { _svgWidget = new SVGWidget(); addChild(_svgWidget); - auto svg = SVG::load(asset::plugin(pluginInstance, "res/button_18px_0.svg")); + auto svg = APP->window->loadSvg(asset::plugin(pluginInstance, "res/button_18px_0.svg")); _frames.push_back(svg); - _frames.push_back(SVG::load(asset::plugin(pluginInstance, "res/button_18px_1_orange.svg"))); - _frames.push_back(SVG::load(asset::plugin(pluginInstance, "res/button_18px_1_green.svg"))); - _frames.push_back(SVG::load(asset::plugin(pluginInstance, "res/button_18px_1_green.svg"))); + _frames.push_back(APP->window->loadSvg(asset::plugin(pluginInstance, "res/button_18px_1_orange.svg"))); + _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); box.size = _svgWidget->box.size; diff --git a/src/mixer.hpp b/src/mixer.hpp @@ -60,8 +60,8 @@ struct MixerChannel { struct MuteButton : ToggleButton { MuteButton() { - addFrame(SVG::load(asset::plugin(pluginInstance, "res/button_18px_0.svg"))); - addFrame(SVG::load(asset::plugin(pluginInstance, "res/button_18px_1_orange.svg"))); + addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/button_18px_0.svg"))); + addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/button_18px_1_orange.svg"))); } }; diff --git a/src/template_panels.cpp b/src/template_panels.cpp @@ -8,7 +8,7 @@ struct ThreeHPWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/ThreeHP.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/ThreeHP.svg"))); addChild(panel); } @@ -27,7 +27,7 @@ struct SixHPWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/SixHP.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/SixHP.svg"))); addChild(panel); } @@ -46,7 +46,7 @@ struct EightHPWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/EightHP.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/EightHP.svg"))); addChild(panel); } @@ -65,7 +65,7 @@ struct TenHPWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/TenHP.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/TenHP.svg"))); addChild(panel); } @@ -86,7 +86,7 @@ struct TwelveHPWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/TwelveHP.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/TwelveHP.svg"))); addChild(panel); } @@ -106,7 +106,7 @@ struct ThirteenHPWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/ThirteenHP.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/ThirteenHP.svg"))); addChild(panel); } @@ -127,7 +127,7 @@ struct FifteenHPWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/FifteenHP.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/FifteenHP.svg"))); addChild(panel); } @@ -148,7 +148,7 @@ struct EighteenHPWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/EighteenHP.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/EighteenHP.svg"))); addChild(panel); } @@ -169,7 +169,7 @@ struct TwentyHPWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/TwentyHP.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/TwentyHP.svg"))); addChild(panel); } @@ -190,7 +190,7 @@ struct TwentyTwoHPWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/TwentyTwoHP.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/TwentyTwoHP.svg"))); addChild(panel); } @@ -211,7 +211,7 @@ struct TwentyFiveHPWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/TwentyFiveHP.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/TwentyFiveHP.svg"))); addChild(panel); } @@ -232,7 +232,7 @@ struct ThirtyHPWidget : ModuleWidget { { SVGPanel *panel = new SVGPanel(); panel->box.size = box.size; - panel->setBackground(SVG::load(asset::plugin(pluginInstance, "res/ThirtyHP.svg"))); + panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/ThirtyHP.svg"))); addChild(panel); } diff --git a/src/widgets.cpp b/src/widgets.cpp @@ -6,14 +6,14 @@ using namespace bogaudio; using namespace bogaudio::dsp; Button18::Button18() { - addFrame(SVG::load(asset::plugin(pluginInstance, "res/button_18px_0.svg"))); - addFrame(SVG::load(asset::plugin(pluginInstance, "res/button_18px_1.svg"))); + addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/button_18px_0.svg"))); + addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/button_18px_1.svg"))); box.size = Vec(18, 18); } BGKnob::BGKnob(const char* svg, int dim) { - setSVG(SVG::load(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(SVG::load(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); @@ -74,8 +74,8 @@ SliderSwitch::SliderSwitch() { SliderSwitch2State14::SliderSwitch2State14() { - addFrame(SVG::load(asset::plugin(pluginInstance, "res/slider_switch_2_14px_0.svg"))); - addFrame(SVG::load(asset::plugin(pluginInstance, "res/slider_switch_2_14px_1.svg"))); + addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/slider_switch_2_14px_0.svg"))); + addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/slider_switch_2_14px_1.svg"))); shadow->box.size = Vec(14.0, 24.0); shadow->blurRadius = 1.0; shadow->box.pos = Vec(0.0, 7.0); @@ -89,9 +89,9 @@ StatefulButton::StatefulButton(const char* offSVGPath, const char* onSVGPath) { _svgWidget = new SVGWidget(); addChild(_svgWidget); - auto svg = SVG::load(asset::plugin(pluginInstance, offSVGPath)); + auto svg = APP->window->loadSvg(asset::plugin(pluginInstance, offSVGPath)); _frames.push_back(svg); - _frames.push_back(SVG::load(asset::plugin(pluginInstance, onSVGPath))); + _frames.push_back(APP->window->loadSvg(asset::plugin(pluginInstance, onSVGPath))); _svgWidget->setSVG(svg); box.size = _svgWidget->box.size; @@ -132,8 +132,8 @@ StatefulButton18::StatefulButton18() : StatefulButton("res/button_18px_0.svg", " ToggleButton18::ToggleButton18() { - addFrame(SVG::load(asset::plugin(pluginInstance, "res/button_18px_0.svg"))); - addFrame(SVG::load(asset::plugin(pluginInstance, "res/button_18px_1.svg"))); + addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/button_18px_0.svg"))); + addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/button_18px_1.svg"))); }