Update to Rack v1 API

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2016 Andrew Belt
+Copyright (c) 2016-2018 Andrew Belt
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

Makefile

@@ -13,7 +13,6 @@ DEP_LOCAL := dep
 DEPS += $(libsamplerate)
 
 $(libsamplerate):
-	mkdir -p dep
 	cd dep && $(WGET) http://www.mega-nerd.com/SRC/libsamplerate-0.1.9.tar.gz
 	cd dep && $(UNTAR) libsamplerate-0.1.9.tar.gz
 	cd dep/libsamplerate-0.1.9 && $(CONFIGURE)

README.md

@@ -13,4 +13,5 @@ Source code licensed under [BSD-3-Clause](LICENSE.txt) by [Andrew Belt](https://
 
 VCV logo is © 2017. Derivative works may not use the VCV logo.
 
-Panel graphics in `res/` are © 2017 by [Grayscale](http://grayscale.info/). You may not create derivative works of Fundamental panels.
+The panel graphics in the `res` directory are copyright © 2017-2019 [Grayscale](http://grayscale.info/) and licensed under [CC BY-NC-ND 4.0](https://creativecommons.org/licenses/by-nc-nd/4.0/).
+You may not create derivative works of these graphics.

src/8vert.cpp

@@ -42,7 +42,7 @@ struct _8vert : Module {
 struct _8vertWidget : ModuleWidget {
 	_8vertWidget(_8vert *module) {
 		setModule(module);
-		setPanel(SVG::load(asset::plugin(pluginInstance, "res/8vert.svg")));
+		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/8vert.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(15, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0)));

src/ADSR.cpp

@@ -108,7 +108,7 @@ struct ADSR : Module {
 struct ADSRWidget : ModuleWidget {
 	ADSRWidget(ADSR *module) {
 		setModule(module);
-		setPanel(SVG::load(asset::plugin(pluginInstance, "res/ADSR.svg")));
+		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/ADSR.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(15, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(box.size.x-30, 0)));

src/Delay.cpp

@@ -113,7 +113,7 @@ struct Delay : Module {
 struct DelayWidget : ModuleWidget {
 	DelayWidget(Delay *module) {
 		setModule(module);
-		setPanel(SVG::load(asset::plugin(pluginInstance, "res/Delay.svg")));
+		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Delay.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(15, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(box.size.x-30, 0)));

src/LFO.cpp

@@ -131,7 +131,7 @@ struct LFO : Module {
 struct LFOWidget : ModuleWidget {
 	LFOWidget(LFO *module) {
 		setModule(module);
-		setPanel(SVG::load(asset::plugin(pluginInstance, "res/LFO-1.svg")));
+		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/LFO-1.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(15, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(box.size.x-30, 0)));
@@ -228,7 +228,7 @@ struct LFO2 : Module {
 struct LFO2Widget : ModuleWidget {
 	LFO2Widget(LFO2 *module) {
 		setModule(module);
-		setPanel(SVG::load(asset::plugin(pluginInstance, "res/LFO-2.svg")));
+		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/LFO-2.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(15, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(box.size.x-30, 0)));

src/Mutes.cpp

@@ -94,7 +94,7 @@ struct MuteLight : BASE {
 struct MutesWidget : ModuleWidget {
 	MutesWidget(Mutes *module) {
 		setModule(module);
-		setPanel(SVG::load(asset::plugin(pluginInstance, "res/Mutes.svg")));
+		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Mutes.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(15, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0)));

src/SEQ3.cpp

@@ -175,7 +175,7 @@ struct SEQ3 : Module {
 struct SEQ3Widget : ModuleWidget {
 	SEQ3Widget(SEQ3 *module) {
 		setModule(module);
-		setPanel(SVG::load(asset::plugin(pluginInstance, "res/SEQ3.svg")));
+		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/SEQ3.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(15, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(box.size.x-30, 0)));

src/Scope.cpp

@@ -164,7 +164,7 @@ struct ScopeDisplay : TransparentWidget {
 	Stats statsX, statsY;
 
 	ScopeDisplay() {
-		font = Font::load(asset::plugin(pluginInstance, "res/fonts/Sudo.ttf"));
+		font = APP->window->loadFont(asset::plugin(pluginInstance, "res/fonts/Sudo.ttf"));
 	}
 
 	void drawWaveform(const DrawContext &ctx, float *valuesX, float *valuesY) {
@@ -313,7 +313,7 @@ struct ScopeDisplay : TransparentWidget {
 struct ScopeWidget : ModuleWidget {
 	ScopeWidget(Scope *module) {
 		setModule(module);
-		setPanel(SVG::load(asset::plugin(pluginInstance, "res/Scope.svg")));
+		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Scope.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(15, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(box.size.x-30, 0)));

src/SequentialSwitch.cpp

@@ -81,7 +81,7 @@ struct SequentialSwitch1Widget : ModuleWidget {
 
 	SequentialSwitch1Widget(SequentialSwitch<1> *module) {
 		setModule(module);
-		setPanel(SVG::load(asset::plugin(pluginInstance, "res/SequentialSwitch1.svg")));
+		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/SequentialSwitch1.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
@@ -113,7 +113,7 @@ struct SequentialSwitch2Widget : ModuleWidget {
 
 	SequentialSwitch2Widget(SequentialSwitch<2> *module) {
 		setModule(module);
-		setPanel(SVG::load(asset::plugin(pluginInstance, "res/SequentialSwitch2.svg")));
+		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/SequentialSwitch2.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));

src/Unity.cpp

@@ -106,7 +106,7 @@ struct UnityMergeItem : MenuItem {
 struct UnityWidget : ModuleWidget {
 	UnityWidget(Unity *module) {
 		setModule(module);
-		setPanel(SVG::load(asset::plugin(pluginInstance, "res/Unity.svg")));
+		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Unity.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(15, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0)));

src/VCA.cpp

@@ -49,7 +49,7 @@ struct VCA : Module {
 struct VCAWidget : ModuleWidget {
 	VCAWidget(VCA *module) {
 		setModule(module);
-		setPanel(SVG::load(asset::plugin(pluginInstance, "res/VCA.svg")));
+		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/VCA.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(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 {
 	VCA_1Widget(VCA_1 *module) {
 		setModule(module);
-		setPanel(SVG::load(asset::plugin(pluginInstance, "res/VCA-1.svg")));
+		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/VCA-1.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0)));

src/VCF.cpp

@@ -152,7 +152,7 @@ struct VCF : Module {
 struct VCFWidget : ModuleWidget {
 	VCFWidget(VCF *module) {
 		setModule(module);
-		setPanel(SVG::load(asset::plugin(pluginInstance, "res/VCF.svg")));
+		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/VCF.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(15, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0)));

src/VCMixer.cpp

@@ -49,7 +49,7 @@ struct VCMixer : Module {
 struct VCMixerWidget : ModuleWidget {
 	VCMixerWidget(VCMixer *module) {
 		setModule(module);
-		setPanel(SVG::load(asset::plugin(pluginInstance, "res/VCMixer.svg")));
+		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/VCMixer.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0)));

src/VCO.cpp

@@ -238,7 +238,7 @@ struct VCO : Module {
 struct VCOWidget : ModuleWidget {
 	VCOWidget(VCO *module) {
 		setModule(module);
-		setPanel(SVG::load(asset::plugin(pluginInstance, "res/VCO-1.svg")));
+		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/VCO-1.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(15, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(box.size.x-30, 0)));
@@ -340,7 +340,7 @@ struct VCO2 : Module {
 struct VCO2Widget : ModuleWidget {
 	VCO2Widget(VCO2 *module) {
 		setModule(module);
-		setPanel(SVG::load(asset::plugin(pluginInstance, "res/VCO-2.svg")));
+		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/VCO-2.svg")));
 
 		addChild(createWidget<ScrewSilver>(Vec(15, 0)));
 		addChild(createWidget<ScrewSilver>(Vec(box.size.x-30, 0)));