diff --git a/src/AudibleInstruments.cpp b/src/AudibleInstruments.cpp index 2c67a4a..34f7961 100644 --- a/src/AudibleInstruments.cpp +++ b/src/AudibleInstruments.cpp @@ -1,28 +1,25 @@ #include "AudibleInstruments.hpp" -struct AudibleInstrumentsPlugin : Plugin { - AudibleInstrumentsPlugin() { - slug = "AudibleInstruments"; - name = "Audible Instruments"; - createModel(this, "Braids", "Macro Oscillator"); - createModel(this, "Elements", "Modal Synthesizer"); - createModel(this, "Tides", "Tidal Modulator"); - createModel(this, "Sheep", "Wavetable Oscillator"); - // createModel(this, "Streams", "Dual Dynamics Gate"); - createModel(this, "Clouds", "Texture Synthesizer"); - createModel(this, "Warps", "Meta Modulator"); - createModel(this, "Rings", "Resonator"); - createModel(this, "Links", "Multiples"); - createModel(this, "Kinks", "Utilities"); - createModel(this, "Shades", "Mixer"); - createModel(this, "Branches", "Bernoulli Gate"); - createModel(this, "Blinds", "Quad VC-polarizer"); - createModel(this, "Veils", "Quad VCA"); - } -}; +Plugin *plugin; - -Plugin *init() { - return new AudibleInstrumentsPlugin(); +void init(rack::Plugin *p) { + plugin = p; + plugin->slug = "AudibleInstruments"; + plugin->name = "Audible Instruments"; + createModel(plugin, "Braids", "Macro Oscillator"); + createModel(plugin, "Elements", "Modal Synthesizer"); + createModel(plugin, "Tides", "Tidal Modulator"); + createModel(plugin, "Sheep", "Wavetable Oscillator"); + // createModel(plugin, "Streams", "Dual Dynamics Gate"); + createModel(plugin, "Clouds", "Texture Synthesizer"); + createModel(plugin, "Warps", "Meta Modulator"); + createModel(plugin, "Rings", "Resonator"); + createModel(plugin, "Links", "Multiples"); + createModel(plugin, "Kinks", "Utilities"); + createModel(plugin, "Shades", "Mixer"); + createModel(plugin, "Branches", "Bernoulli Gate"); + createModel(plugin, "Blinds", "Quad VC-polarizer"); + createModel(plugin, "Veils", "Quad VCA"); + createModel(plugin, "Frames", "Keyframer"); } diff --git a/src/AudibleInstruments.hpp b/src/AudibleInstruments.hpp index 39f5ff4..446f25a 100644 --- a/src/AudibleInstruments.hpp +++ b/src/AudibleInstruments.hpp @@ -4,6 +4,8 @@ using namespace rack; +extern Plugin *plugin; + //////////////////// // module widgets //////////////////// @@ -64,3 +66,7 @@ struct BlindsWidget : ModuleWidget { struct VeilsWidget : ModuleWidget { VeilsWidget(); }; + +struct FramesWidget : ModuleWidget { + FramesWidget(); +}; diff --git a/src/Blinds.cpp b/src/Blinds.cpp index 1e38355..c7bd1bb 100644 --- a/src/Blinds.cpp +++ b/src/Blinds.cpp @@ -91,7 +91,7 @@ BlindsWidget::BlindsWidget() { { Panel *panel = new LightPanel(); - panel->backgroundImage = Image::load("plugins/AudibleInstruments/res/Blinds.png"); + panel->backgroundImage = Image::load(assetPlugin(plugin, "res/Blinds.png")); panel->box.size = box.size; addChild(panel); } diff --git a/src/Braids.cpp b/src/Braids.cpp index 84a4ec8..5858ea6 100644 --- a/src/Braids.cpp +++ b/src/Braids.cpp @@ -163,7 +163,7 @@ struct BraidsDisplay : TransparentWidget { std::shared_ptr font; BraidsDisplay() { - font = Font::load("plugins/AudibleInstruments/res/hdad-segment14-1.002/Segment14.ttf"); + font = Font::load(assetPlugin(plugin, "res/hdad-segment14-1.002/Segment14.ttf")); } void draw(NVGcontext *vg) { @@ -201,7 +201,7 @@ BraidsWidget::BraidsWidget() { { Panel *panel = new LightPanel(); - panel->backgroundImage = Image::load("plugins/AudibleInstruments/res/Braids.png"); + panel->backgroundImage = Image::load(assetPlugin(plugin, "res/Braids.png")); panel->box.size = box.size; addChild(panel); } diff --git a/src/Branches.cpp b/src/Branches.cpp index 68f100c..60d3d78 100644 --- a/src/Branches.cpp +++ b/src/Branches.cpp @@ -80,7 +80,7 @@ BranchesWidget::BranchesWidget() { { Panel *panel = new LightPanel(); - panel->backgroundImage = Image::load("plugins/AudibleInstruments/res/Branches.png"); + panel->backgroundImage = Image::load(assetPlugin(plugin, "res/Branches.png")); panel->box.size = box.size; addChild(panel); } diff --git a/src/Clouds.cpp b/src/Clouds.cpp index 8134236..d0d9e3f 100644 --- a/src/Clouds.cpp +++ b/src/Clouds.cpp @@ -164,7 +164,7 @@ CloudsWidget::CloudsWidget() { { Panel *panel = new LightPanel(); - panel->backgroundImage = Image::load("plugins/AudibleInstruments/res/Clouds.png"); + panel->backgroundImage = Image::load(assetPlugin(plugin, "res/Clouds.png")); panel->box.size = box.size; addChild(panel); } diff --git a/src/Elements.cpp b/src/Elements.cpp index 459f978..8c326a0 100644 --- a/src/Elements.cpp +++ b/src/Elements.cpp @@ -217,7 +217,7 @@ ElementsWidget::ElementsWidget() { { Panel *panel = new LightPanel(); - panel->backgroundImage = Image::load("plugins/AudibleInstruments/res/Elements.png"); + panel->backgroundImage = Image::load(assetPlugin(plugin, "res/Elements.png")); panel->box.size = box.size; addChild(panel); } diff --git a/src/Kinks.cpp b/src/Kinks.cpp index 23d63b2..2f9e19b 100644 --- a/src/Kinks.cpp +++ b/src/Kinks.cpp @@ -92,7 +92,7 @@ KinksWidget::KinksWidget() { { Panel *panel = new LightPanel(); - panel->backgroundImage = Image::load("plugins/AudibleInstruments/res/Kinks.png"); + panel->backgroundImage = Image::load(assetPlugin(plugin, "res/Kinks.png")); panel->box.size = box.size; addChild(panel); } diff --git a/src/Links.cpp b/src/Links.cpp index ffedeb9..bdf34ad 100644 --- a/src/Links.cpp +++ b/src/Links.cpp @@ -61,7 +61,7 @@ LinksWidget::LinksWidget() { { Panel *panel = new LightPanel(); - panel->backgroundImage = Image::load("plugins/AudibleInstruments/res/Links.png"); + panel->backgroundImage = Image::load(assetPlugin(plugin, "res/Links.png")); panel->box.size = box.size; addChild(panel); } diff --git a/src/Rings.cpp b/src/Rings.cpp index 0db9d59..bf1967f 100644 --- a/src/Rings.cpp +++ b/src/Rings.cpp @@ -247,7 +247,7 @@ RingsWidget::RingsWidget() { { Panel *panel = new LightPanel(); - panel->backgroundImage = Image::load("plugins/AudibleInstruments/res/Rings.png"); + panel->backgroundImage = Image::load(assetPlugin(plugin, "res/Rings.png")); panel->box.size = box.size; addChild(panel); } diff --git a/src/Shades.cpp b/src/Shades.cpp index 1f2c409..0d4018b 100644 --- a/src/Shades.cpp +++ b/src/Shades.cpp @@ -82,7 +82,7 @@ ShadesWidget::ShadesWidget() { { Panel *panel = new LightPanel(); - panel->backgroundImage = Image::load("plugins/AudibleInstruments/res/Shades.png"); + panel->backgroundImage = Image::load(assetPlugin(plugin, "res/Shades.png")); panel->box.size = box.size; addChild(panel); } diff --git a/src/Sheep.cpp b/src/Sheep.cpp index c1628c2..28ffe91 100644 --- a/src/Sheep.cpp +++ b/src/Sheep.cpp @@ -193,7 +193,7 @@ SheepWidget::SheepWidget() { { Panel *panel = new LightPanel(); - panel->backgroundImage = Image::load("plugins/AudibleInstruments/res/Sheep.png"); + panel->backgroundImage = Image::load(assetPlugin(plugin, "res/Sheep.png")); panel->box.size = box.size; addChild(panel); } diff --git a/src/Streams.cpp b/src/Streams.cpp index 8fb19bb..6ea8052 100644 --- a/src/Streams.cpp +++ b/src/Streams.cpp @@ -53,7 +53,7 @@ StreamsWidget::StreamsWidget() { { Panel *panel = new LightPanel(); - panel->backgroundImage = Image::load("plugins/AudibleInstruments/res/Streams.png"); + panel->backgroundImage = Image::load(assetPlugin(plugin, "res/Streams.png")); panel->box.size = box.size; addChild(panel); } diff --git a/src/Tides.cpp b/src/Tides.cpp index 14ff511..4d7163b 100644 --- a/src/Tides.cpp +++ b/src/Tides.cpp @@ -191,7 +191,7 @@ TidesWidget::TidesWidget() { { Panel *panel = new LightPanel(); - panel->backgroundImage = Image::load("plugins/AudibleInstruments/res/Tides.png"); + panel->backgroundImage = Image::load(assetPlugin(plugin, "res/Tides.png")); panel->box.size = box.size; addChild(panel); } diff --git a/src/Veils.cpp b/src/Veils.cpp index 9781ad2..dcb8361 100644 --- a/src/Veils.cpp +++ b/src/Veils.cpp @@ -100,7 +100,7 @@ VeilsWidget::VeilsWidget() { { Panel *panel = new LightPanel(); - panel->backgroundImage = Image::load("plugins/AudibleInstruments/res/Veils.png"); + panel->backgroundImage = Image::load(assetPlugin(plugin, "res/Veils.png")); panel->box.size = box.size; addChild(panel); } diff --git a/src/Warps.cpp b/src/Warps.cpp index d8c017e..7cb7190 100644 --- a/src/Warps.cpp +++ b/src/Warps.cpp @@ -144,6 +144,7 @@ struct WarpsAlgoLight : ValueLight { } }; + WarpsWidget::WarpsWidget() { Warps *module = new Warps(); setModule(module); @@ -151,7 +152,7 @@ WarpsWidget::WarpsWidget() { { Panel *panel = new LightPanel(); - panel->backgroundImage = Image::load("plugins/AudibleInstruments/res/Warps.png"); + panel->backgroundImage = Image::load(assetPlugin(plugin, "res/Warps.png")); panel->box.size = box.size; addChild(panel); }