Move asset to its own namespace

include/asset.hpp

@@ -5,19 +5,21 @@
 
 
 namespace rack {
+namespace asset {
 
 
-void assetInit(bool devMode);
+void init(bool devMode);
 /** Returns the path of a global resource. Should only read files from this location. */
-std::string assetGlobal(std::string filename);
+std::string global(std::string filename);
 /** Returns the path of a local resource. Can read and write files to this location. */
-std::string assetLocal(std::string filename);
+std::string local(std::string filename);
 /** Returns the path of a resource in the plugin's folder. Should only read files from this location. */
-std::string assetPlugin(Plugin *plugin, std::string filename);
+std::string plugin(Plugin *plugin, std::string filename);
 
 
-extern std::string assetGlobalDir;
-extern std::string assetLocalDir;
+extern std::string globalDir;
+extern std::string localDir;
 
 
+} // namespace asset
 } // namespace rack

include/componentlibrary.hpp

@@ -35,25 +35,25 @@ struct RoundKnob : SVGKnob {
 
 struct RoundBlackKnob : RoundKnob {
 	RoundBlackKnob() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/RoundBlackKnob.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/RoundBlackKnob.svg")));
 	}
 };
 
 struct RoundSmallBlackKnob : RoundKnob {
 	RoundSmallBlackKnob() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/RoundSmallBlackKnob.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/RoundSmallBlackKnob.svg")));
 	}
 };
 
 struct RoundLargeBlackKnob : RoundKnob {
 	RoundLargeBlackKnob() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/RoundLargeBlackKnob.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/RoundLargeBlackKnob.svg")));
 	}
 };
 
 struct RoundHugeBlackKnob : RoundKnob {
 	RoundHugeBlackKnob() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/RoundHugeBlackKnob.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/RoundHugeBlackKnob.svg")));
 	}
 };
 
@@ -74,37 +74,37 @@ struct Davies1900hKnob : SVGKnob {
 
 struct Davies1900hWhiteKnob : Davies1900hKnob {
 	Davies1900hWhiteKnob() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Davies1900hWhite.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Davies1900hWhite.svg")));
 	}
 };
 
 struct Davies1900hBlackKnob : Davies1900hKnob {
 	Davies1900hBlackKnob() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Davies1900hBlack.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Davies1900hBlack.svg")));
 	}
 };
 
 struct Davies1900hRedKnob : Davies1900hKnob {
 	Davies1900hRedKnob() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Davies1900hRed.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Davies1900hRed.svg")));
 	}
 };
 
 struct Davies1900hLargeWhiteKnob : Davies1900hKnob {
 	Davies1900hLargeWhiteKnob() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Davies1900hLargeWhite.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Davies1900hLargeWhite.svg")));
 	}
 };
 
 struct Davies1900hLargeBlackKnob : Davies1900hKnob {
 	Davies1900hLargeBlackKnob() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Davies1900hLargeBlack.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Davies1900hLargeBlack.svg")));
 	}
 };
 
 struct Davies1900hLargeRedKnob : Davies1900hKnob {
 	Davies1900hLargeRedKnob() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Davies1900hLargeRed.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Davies1900hLargeRed.svg")));
 	}
 };
 
@@ -118,163 +118,163 @@ struct Rogan : SVGKnob {
 
 struct Rogan6PSWhite : Rogan {
 	Rogan6PSWhite() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Rogan6PSWhite.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Rogan6PSWhite.svg")));
 	}
 };
 
 struct Rogan5PSGray : Rogan {
 	Rogan5PSGray() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Rogan5PSGray.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Rogan5PSGray.svg")));
 	}
 };
 
 struct Rogan3PSBlue : Rogan {
 	Rogan3PSBlue() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Rogan3PSBlue.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Rogan3PSBlue.svg")));
 	}
 };
 
 struct Rogan3PSRed : Rogan {
 	Rogan3PSRed() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Rogan3PSRed.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Rogan3PSRed.svg")));
 	}
 };
 
 struct Rogan3PSGreen : Rogan {
 	Rogan3PSGreen() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Rogan3PSGreen.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Rogan3PSGreen.svg")));
 	}
 };
 
 struct Rogan3PSWhite : Rogan {
 	Rogan3PSWhite() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Rogan3PSWhite.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Rogan3PSWhite.svg")));
 	}
 };
 
 struct Rogan3PBlue : Rogan {
 	Rogan3PBlue() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Rogan3PBlue.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Rogan3PBlue.svg")));
 	}
 };
 
 struct Rogan3PRed : Rogan {
 	Rogan3PRed() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Rogan3PRed.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Rogan3PRed.svg")));
 	}
 };
 
 struct Rogan3PGreen : Rogan {
 	Rogan3PGreen() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Rogan3PGreen.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Rogan3PGreen.svg")));
 	}
 };
 
 struct Rogan3PWhite : Rogan {
 	Rogan3PWhite() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Rogan3PWhite.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Rogan3PWhite.svg")));
 	}
 };
 
 struct Rogan2SGray : Rogan {
 	Rogan2SGray() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Rogan2SGray.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Rogan2SGray.svg")));
 	}
 };
 
 struct Rogan2PSBlue : Rogan {
 	Rogan2PSBlue() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Rogan2PSBlue.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Rogan2PSBlue.svg")));
 	}
 };
 
 struct Rogan2PSRed : Rogan {
 	Rogan2PSRed() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Rogan2PSRed.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Rogan2PSRed.svg")));
 	}
 };
 
 struct Rogan2PSGreen : Rogan {
 	Rogan2PSGreen() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Rogan2PSGreen.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Rogan2PSGreen.svg")));
 	}
 };
 
 struct Rogan2PSWhite : Rogan {
 	Rogan2PSWhite() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Rogan2PSWhite.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Rogan2PSWhite.svg")));
 	}
 };
 
 struct Rogan2PBlue : Rogan {
 	Rogan2PBlue() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Rogan2PBlue.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Rogan2PBlue.svg")));
 	}
 };
 
 struct Rogan2PRed : Rogan {
 	Rogan2PRed() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Rogan2PRed.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Rogan2PRed.svg")));
 	}
 };
 
 struct Rogan2PGreen : Rogan {
 	Rogan2PGreen() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Rogan2PGreen.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Rogan2PGreen.svg")));
 	}
 };
 
 struct Rogan2PWhite : Rogan {
 	Rogan2PWhite() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Rogan2PWhite.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Rogan2PWhite.svg")));
 	}
 };
 
 struct Rogan1PSBlue : Rogan {
 	Rogan1PSBlue() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Rogan1PSBlue.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Rogan1PSBlue.svg")));
 	}
 };
 
 struct Rogan1PSRed : Rogan {
 	Rogan1PSRed() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Rogan1PSRed.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Rogan1PSRed.svg")));
 	}
 };
 
 struct Rogan1PSGreen : Rogan {
 	Rogan1PSGreen() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Rogan1PSGreen.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Rogan1PSGreen.svg")));
 	}
 };
 
 struct Rogan1PSWhite : Rogan {
 	Rogan1PSWhite() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Rogan1PSWhite.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Rogan1PSWhite.svg")));
 	}
 };
 
 struct Rogan1PBlue : Rogan {
 	Rogan1PBlue() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Rogan1PBlue.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Rogan1PBlue.svg")));
 	}
 };
 
 struct Rogan1PRed : Rogan {
 	Rogan1PRed() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Rogan1PRed.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Rogan1PRed.svg")));
 	}
 };
 
 struct Rogan1PGreen : Rogan {
 	Rogan1PGreen() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Rogan1PGreen.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Rogan1PGreen.svg")));
 	}
 };
 
 struct Rogan1PWhite : Rogan {
 	Rogan1PWhite() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Rogan1PWhite.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Rogan1PWhite.svg")));
 	}
 };
 
@@ -283,9 +283,9 @@ struct SynthTechAlco : SVGKnob {
 	SynthTechAlco() {
 		minAngle = -0.82*M_PI;
 		maxAngle = 0.82*M_PI;
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/SynthTechAlco.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/SynthTechAlco.svg")));
 		SVGWidget *cap = new SVGWidget();
-		cap->setSVG(SVG::load(assetGlobal("res/ComponentLibrary/SynthTechAlco_cap.svg")));
+		cap->setSVG(SVG::load(asset::global("res/ComponentLibrary/SynthTechAlco_cap.svg")));
 		addChild(cap);
 	}
 };
@@ -294,7 +294,7 @@ struct Trimpot : SVGKnob {
 	Trimpot() {
 		minAngle = -0.75*M_PI;
 		maxAngle = 0.75*M_PI;
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/Trimpot.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/Trimpot.svg")));
 	}
 };
 
@@ -302,7 +302,7 @@ struct BefacoBigKnob : SVGKnob {
 	BefacoBigKnob() {
 		minAngle = -0.75*M_PI;
 		maxAngle = 0.75*M_PI;
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/BefacoBigKnob.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/BefacoBigKnob.svg")));
 	}
 };
 
@@ -317,7 +317,7 @@ struct BefacoTinyKnob : SVGKnob {
 	BefacoTinyKnob() {
 		minAngle = -0.75*M_PI;
 		maxAngle = 0.75*M_PI;
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/BefacoTinyKnob.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/BefacoTinyKnob.svg")));
 	}
 };
 
@@ -326,7 +326,7 @@ struct BefacoSlidePot : SVGSlider {
 		Vec margin = Vec(3.5, 3.5);
 		maxHandlePos = Vec(-1, -2).plus(margin);
 		minHandlePos = Vec(-1, 87).plus(margin);
-		setSVGs(SVG::load(assetGlobal("res/ComponentLibrary/BefacoSlidePot.svg")), SVG::load(assetGlobal("res/ComponentLibrary/BefacoSlidePotHandle.svg")));
+		setSVGs(SVG::load(asset::global("res/ComponentLibrary/BefacoSlidePot.svg")), SVG::load(asset::global("res/ComponentLibrary/BefacoSlidePotHandle.svg")));
 		background->box.pos = margin;
 		box.size = background->box.size.plus(margin.mult(2));
 	}
@@ -336,38 +336,38 @@ struct LEDSlider : SVGSlider {
 	LEDSlider() {
 		maxHandlePos = mm2px(Vec(0.738, 0.738).plus(Vec(2, 0)));
 		minHandlePos = mm2px(Vec(0.738, 22.078).plus(Vec(2, 0)));
-		setSVGs(SVG::load(assetGlobal("res/ComponentLibrary/LEDSlider.svg")), NULL);
+		setSVGs(SVG::load(asset::global("res/ComponentLibrary/LEDSlider.svg")), NULL);
 	}
 };
 
 /** API is unstable for LEDSlider. Will add a LightWidget later. */
 struct LEDSliderGreen : LEDSlider {
 	LEDSliderGreen() {
-		handle->setSVG(SVG::load(assetGlobal("res/ComponentLibrary/LEDSliderGreenHandle.svg")));
+		handle->setSVG(SVG::load(asset::global("res/ComponentLibrary/LEDSliderGreenHandle.svg")));
 	}
 };
 
 struct LEDSliderRed : LEDSlider {
 	LEDSliderRed() {
-		handle->setSVG(SVG::load(assetGlobal("res/ComponentLibrary/LEDSliderRedHandle.svg")));
+		handle->setSVG(SVG::load(asset::global("res/ComponentLibrary/LEDSliderRedHandle.svg")));
 	}
 };
 
 struct LEDSliderYellow : LEDSlider {
 	LEDSliderYellow() {
-		handle->setSVG(SVG::load(assetGlobal("res/ComponentLibrary/LEDSliderYellowHandle.svg")));
+		handle->setSVG(SVG::load(asset::global("res/ComponentLibrary/LEDSliderYellowHandle.svg")));
 	}
 };
 
 struct LEDSliderBlue : LEDSlider {
 	LEDSliderBlue() {
-		handle->setSVG(SVG::load(assetGlobal("res/ComponentLibrary/LEDSliderBlueHandle.svg")));
+		handle->setSVG(SVG::load(asset::global("res/ComponentLibrary/LEDSliderBlueHandle.svg")));
 	}
 };
 
 struct LEDSliderWhite : LEDSlider {
 	LEDSliderWhite() {
-		handle->setSVG(SVG::load(assetGlobal("res/ComponentLibrary/LEDSliderWhiteHandle.svg")));
+		handle->setSVG(SVG::load(asset::global("res/ComponentLibrary/LEDSliderWhiteHandle.svg")));
 	}
 };
 
@@ -377,19 +377,19 @@ struct LEDSliderWhite : LEDSlider {
 
 struct PJ301MPort : SVGPort {
 	PJ301MPort() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/PJ301M.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/PJ301M.svg")));
 	}
 };
 
 struct PJ3410Port : SVGPort {
 	PJ3410Port() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/PJ3410.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/PJ3410.svg")));
 	}
 };
 
 struct CL1362Port : SVGPort {
 	CL1362Port() {
-		setSVG(SVG::load(assetGlobal("res/ComponentLibrary/CL1362.svg")));
+		setSVG(SVG::load(asset::global("res/ComponentLibrary/CL1362.svg")));
 	}
 };
 
@@ -512,83 +512,83 @@ struct PB61303Light : BASE {
 
 struct NKK : SVGSwitch, ToggleSwitch {
 	NKK() {
-		addFrame(SVG::load(assetGlobal("res/ComponentLibrary/NKK_0.svg")));
-		addFrame(SVG::load(assetGlobal("res/ComponentLibrary/NKK_1.svg")));
-		addFrame(SVG::load(assetGlobal("res/ComponentLibrary/NKK_2.svg")));
+		addFrame(SVG::load(asset::global("res/ComponentLibrary/NKK_0.svg")));
+		addFrame(SVG::load(asset::global("res/ComponentLibrary/NKK_1.svg")));
+		addFrame(SVG::load(asset::global("res/ComponentLibrary/NKK_2.svg")));
 	}
 };
 
 struct CKSS : SVGSwitch, ToggleSwitch {
 	CKSS() {
-		addFrame(SVG::load(assetGlobal("res/ComponentLibrary/CKSS_0.svg")));
-		addFrame(SVG::load(assetGlobal("res/ComponentLibrary/CKSS_1.svg")));
+		addFrame(SVG::load(asset::global("res/ComponentLibrary/CKSS_0.svg")));
+		addFrame(SVG::load(asset::global("res/ComponentLibrary/CKSS_1.svg")));
 	}
 };
 
 struct CKSSThree : SVGSwitch, ToggleSwitch {
 	CKSSThree() {
-		addFrame(SVG::load(assetGlobal("res/ComponentLibrary/CKSSThree_0.svg")));
-		addFrame(SVG::load(assetGlobal("res/ComponentLibrary/CKSSThree_1.svg")));
-		addFrame(SVG::load(assetGlobal("res/ComponentLibrary/CKSSThree_2.svg")));
+		addFrame(SVG::load(asset::global("res/ComponentLibrary/CKSSThree_0.svg")));
+		addFrame(SVG::load(asset::global("res/ComponentLibrary/CKSSThree_1.svg")));
+		addFrame(SVG::load(asset::global("res/ComponentLibrary/CKSSThree_2.svg")));
 	}
 };
 
 struct CKD6 : SVGSwitch, MomentarySwitch {
 	CKD6() {
-		addFrame(SVG::load(assetGlobal("res/ComponentLibrary/CKD6_0.svg")));
-		addFrame(SVG::load(assetGlobal("res/ComponentLibrary/CKD6_1.svg")));
+		addFrame(SVG::load(asset::global("res/ComponentLibrary/CKD6_0.svg")));
+		addFrame(SVG::load(asset::global("res/ComponentLibrary/CKD6_1.svg")));
 	}
 };
 
 struct TL1105 : SVGSwitch, MomentarySwitch {
 	TL1105() {
-		addFrame(SVG::load(assetGlobal("res/ComponentLibrary/TL1105_0.svg")));
-		addFrame(SVG::load(assetGlobal("res/ComponentLibrary/TL1105_1.svg")));
+		addFrame(SVG::load(asset::global("res/ComponentLibrary/TL1105_0.svg")));
+		addFrame(SVG::load(asset::global("res/ComponentLibrary/TL1105_1.svg")));
 	}
 };
 
 struct LEDButton : SVGSwitch, MomentarySwitch {
 	LEDButton() {
-		addFrame(SVG::load(assetGlobal("res/ComponentLibrary/LEDButton.svg")));
+		addFrame(SVG::load(asset::global("res/ComponentLibrary/LEDButton.svg")));
 	}
 };
 
 struct BefacoSwitch : SVGSwitch, ToggleSwitch {
 	BefacoSwitch() {
-		addFrame(SVG::load(assetGlobal("res/ComponentLibrary/BefacoSwitch_0.svg")));
-		addFrame(SVG::load(assetGlobal("res/ComponentLibrary/BefacoSwitch_1.svg")));
-		addFrame(SVG::load(assetGlobal("res/ComponentLibrary/BefacoSwitch_2.svg")));
+		addFrame(SVG::load(asset::global("res/ComponentLibrary/BefacoSwitch_0.svg")));
+		addFrame(SVG::load(asset::global("res/ComponentLibrary/BefacoSwitch_1.svg")));
+		addFrame(SVG::load(asset::global("res/ComponentLibrary/BefacoSwitch_2.svg")));
 	}
 };
 
 struct BefacoPush : SVGSwitch, MomentarySwitch {
 	BefacoPush() {
-		addFrame(SVG::load(assetGlobal("res/ComponentLibrary/BefacoPush_0.svg")));
-		addFrame(SVG::load(assetGlobal("res/ComponentLibrary/BefacoPush_1.svg")));
+		addFrame(SVG::load(asset::global("res/ComponentLibrary/BefacoPush_0.svg")));
+		addFrame(SVG::load(asset::global("res/ComponentLibrary/BefacoPush_1.svg")));
 	}
 };
 
 struct LEDBezel : SVGSwitch, MomentarySwitch {
 	LEDBezel() {
-		addFrame(SVG::load(assetGlobal("res/ComponentLibrary/LEDBezel.svg")));
+		addFrame(SVG::load(asset::global("res/ComponentLibrary/LEDBezel.svg")));
 	}
 };
 
 struct PB61303 : SVGSwitch, MomentarySwitch {
 	PB61303() {
-		addFrame(SVG::load(assetGlobal("res/ComponentLibrary/PB61303.svg")));
+		addFrame(SVG::load(asset::global("res/ComponentLibrary/PB61303.svg")));
 	}
 };
 
 struct PB61303Button : SVGButton {
 	PB61303Button() {
-		setSVGs(SVG::load(assetGlobal("res/ComponentLibrary/PB61303.svg")), NULL);
+		setSVGs(SVG::load(asset::global("res/ComponentLibrary/PB61303.svg")), NULL);
 	}
 };
 
 struct LEDBezelButton : SVGButton {
 	LEDBezelButton() {
-		setSVGs(SVG::load(assetGlobal("res/ComponentLibrary/LEDBezel.svg")), NULL);
+		setSVGs(SVG::load(asset::global("res/ComponentLibrary/LEDBezel.svg")), NULL);
 	}
 };
 
@@ -598,14 +598,14 @@ struct LEDBezelButton : SVGButton {
 
 struct ScrewSilver : SVGScrew {
 	ScrewSilver() {
-		sw->setSVG(SVG::load(assetGlobal("res/ComponentLibrary/ScrewSilver.svg")));
+		sw->setSVG(SVG::load(asset::global("res/ComponentLibrary/ScrewSilver.svg")));
 		box.size = sw->box.size;
 	}
 };
 
 struct ScrewBlack : SVGScrew {
 	ScrewBlack() {
-		sw->setSVG(SVG::load(assetGlobal("res/ComponentLibrary/ScrewBlack.svg")));
+		sw->setSVG(SVG::load(asset::global("res/ComponentLibrary/ScrewBlack.svg")));
 		box.size = sw->box.size;
 	}
 };

src/Core/AudioInterface.cpp

@@ -239,7 +239,7 @@ void AudioInterface::step() {
 
 struct AudioInterfaceWidget : ModuleWidget {
 	AudioInterfaceWidget(AudioInterface *module) : ModuleWidget(module) {
-		setPanel(SVG::load(assetGlobal("res/Core/AudioInterface.svg")));
+		setPanel(SVG::load(asset::global("res/Core/AudioInterface.svg")));
 
 		addChild(Widget::create<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0)));
 		addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0)));

src/Core/MIDICCToCVInterface.cpp

@@ -182,7 +182,7 @@ struct MidiCcWidget : Grid16MidiWidget {
 
 struct MIDICCToCVInterfaceWidget : ModuleWidget {
 	MIDICCToCVInterfaceWidget(MIDICCToCVInterface *module) : ModuleWidget(module) {
-		setPanel(SVG::load(assetGlobal("res/Core/MIDICCToCVInterface.svg")));
+		setPanel(SVG::load(asset::global("res/Core/MIDICCToCVInterface.svg")));
 
 		addChild(Widget::create<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0)));
 		addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0)));

src/Core/MIDIToCVInterface.cpp

@@ -259,7 +259,7 @@ struct MIDIToCVInterface : Module {
 
 struct MIDIToCVInterfaceWidget : ModuleWidget {
 	MIDIToCVInterfaceWidget(MIDIToCVInterface *module) : ModuleWidget(module) {
-		setPanel(SVG::load(assetGlobal("res/Core/MIDIToCVInterface.svg")));
+		setPanel(SVG::load(asset::global("res/Core/MIDIToCVInterface.svg")));
 
 		addChild(Widget::create<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0)));
 		addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0)));

src/Core/MIDITriggerToCVInterface.cpp

@@ -199,7 +199,7 @@ struct MidiTrigWidget : Grid16MidiWidget {
 
 struct MIDITriggerToCVInterfaceWidget : ModuleWidget {
 	MIDITriggerToCVInterfaceWidget(MIDITriggerToCVInterface *module) : ModuleWidget(module) {
-		setPanel(SVG::load(assetGlobal("res/Core/MIDITriggerToCVInterface.svg")));
+		setPanel(SVG::load(asset::global("res/Core/MIDITriggerToCVInterface.svg")));
 
 		addChild(Widget::create<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0)));
 		addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0)));

src/Core/Notes.cpp

@@ -8,7 +8,7 @@ struct NotesWidget : ModuleWidget {
 	TextField *textField;
 
 	NotesWidget(Module *module) : ModuleWidget(module) {
-		setPanel(SVG::load(assetGlobal("res/Core/Notes.svg")));
+		setPanel(SVG::load(asset::global("res/Core/Notes.svg")));
 
 		addChild(Widget::create<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0)));
 		addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0)));

src/Core/QuadMIDIToCVInterface.cpp

@@ -301,7 +301,7 @@ struct QuadMIDIToCVInterface : Module {
 
 struct QuadMIDIToCVInterfaceWidget : ModuleWidget {
 	QuadMIDIToCVInterfaceWidget(QuadMIDIToCVInterface *module) : ModuleWidget(module) {
-		setPanel(SVG::load(assetGlobal("res/Core/QuadMIDIToCVInterface.svg")));
+		setPanel(SVG::load(asset::global("res/Core/QuadMIDIToCVInterface.svg")));
 
 		addChild(Widget::create<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0)));
 		addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0)));

src/app/LedDisplay.cpp

@@ -32,7 +32,7 @@ void LedDisplaySeparator::draw(NVGcontext *vg) {
 
 LedDisplayChoice::LedDisplayChoice() {
 	box.size = mm2px(math::Vec(0, 28.0 / 3));
-	font = Font::load(assetGlobal("res/fonts/ShareTechMono-Regular.ttf"));
+	font = Font::load(asset::global("res/fonts/ShareTechMono-Regular.ttf"));
 	color = nvgRGB(0xff, 0xd7, 0x14);
 	textOffset = math::Vec(10, 18);
 }
@@ -63,7 +63,7 @@ void LedDisplayChoice::onMouseDown(EventMouseDown &e) {
 
 
 LedDisplayTextField::LedDisplayTextField() {
-	font = Font::load(assetGlobal("res/fonts/ShareTechMono-Regular.ttf"));
+	font = Font::load(asset::global("res/fonts/ShareTechMono-Regular.ttf"));
 	color = nvgRGB(0xff, 0xd7, 0x14);
 	textOffset = math::Vec(5, 5);
 }

src/app/ModuleWidget.cpp

@@ -226,7 +226,7 @@ void ModuleWidget::save(std::string filename) {
 }
 
 void ModuleWidget::loadDialog() {
-	std::string dir = assetLocal("presets");
+	std::string dir = asset::local("presets");
 	systemCreateDirectory(dir);
 
 	osdialog_filters *filters = osdialog_filters_parse(PRESET_FILTERS.c_str());
@@ -239,7 +239,7 @@ void ModuleWidget::loadDialog() {
 }
 
 void ModuleWidget::saveDialog() {
-	std::string dir = assetLocal("presets");
+	std::string dir = asset::local("presets");
 	systemCreateDirectory(dir);
 
 	osdialog_filters *filters = osdialog_filters_parse(PRESET_FILTERS.c_str());

src/app/RackWidget.cpp

@@ -63,7 +63,7 @@ void RackWidget::reset() {
 	if (osdialog_message(OSDIALOG_INFO, OSDIALOG_OK_CANCEL, "Clear patch and start over?")) {
 		clear();
 		// Fails silently if file does not exist
-		load(assetLocal("template.vcv"));
+		load(asset::local("template.vcv"));
 		lastPath = "";
 	}
 }
@@ -71,7 +71,7 @@ void RackWidget::reset() {
 void RackWidget::loadDialog() {
 	std::string dir;
 	if (lastPath.empty()) {
-		dir = assetLocal("patches");
+		dir = asset::local("patches");
 		systemCreateDirectory(dir);
 	}
 	else {
@@ -100,7 +100,7 @@ void RackWidget::saveAsDialog() {
 	std::string dir;
 	std::string filename;
 	if (lastPath.empty()) {
-		dir = assetLocal("patches");
+		dir = asset::local("patches");
 		systemCreateDirectory(dir);
 	}
 	else {
@@ -490,8 +490,8 @@ void RackWidget::step() {
 
 	// Autosave every 15 seconds
 	if (gGuiFrame % (60 * 15) == 0) {
-		save(assetLocal("autosave.vcv"));
-		settingsSave(assetLocal("settings.json"));
+		save(asset::local("autosave.vcv"));
+		settingsSave(asset::local("settings.json"));
 	}
 
 	Widget::step();

src/app/Toolbar.cpp

@@ -31,7 +31,7 @@ struct TooltipIconButton : IconButton {
 
 struct NewButton : TooltipIconButton {
 	NewButton() {
-		setSVG(SVG::load(assetGlobal("res/icons/noun_146097_cc.svg")));
+		setSVG(SVG::load(asset::global("res/icons/noun_146097_cc.svg")));
 		tooltipText = "New patch (" WINDOW_MOD_KEY_NAME "+N)";
 	}
 	void onAction(EventAction &e) override {
@@ -41,7 +41,7 @@ struct NewButton : TooltipIconButton {
 
 struct OpenButton : TooltipIconButton {
 	OpenButton() {
-		setSVG(SVG::load(assetGlobal("res/icons/noun_31859_cc.svg")));
+		setSVG(SVG::load(asset::global("res/icons/noun_31859_cc.svg")));
 		tooltipText = "Open patch (" WINDOW_MOD_KEY_NAME "+O)";
 	}
 	void onAction(EventAction &e) override {
@@ -51,7 +51,7 @@ struct OpenButton : TooltipIconButton {
 
 struct SaveButton : TooltipIconButton {
 	SaveButton() {
-		setSVG(SVG::load(assetGlobal("res/icons/noun_1343816_cc.svg")));
+		setSVG(SVG::load(asset::global("res/icons/noun_1343816_cc.svg")));
 		tooltipText = "Save patch (" WINDOW_MOD_KEY_NAME "+S)";
 	}
 	void onAction(EventAction &e) override {
@@ -61,7 +61,7 @@ struct SaveButton : TooltipIconButton {
 
 struct SaveAsButton : TooltipIconButton {
 	SaveAsButton() {
-		setSVG(SVG::load(assetGlobal("res/icons/noun_1343811_cc.svg")));
+		setSVG(SVG::load(asset::global("res/icons/noun_1343811_cc.svg")));
 		tooltipText = "Save patch as (" WINDOW_MOD_KEY_NAME "+Shift+S)";
 	}
 	void onAction(EventAction &e) override {
@@ -71,7 +71,7 @@ struct SaveAsButton : TooltipIconButton {
 
 struct RevertButton : TooltipIconButton {
 	RevertButton() {
-		setSVG(SVG::load(assetGlobal("res/icons/noun_1084369_cc.svg")));
+		setSVG(SVG::load(asset::global("res/icons/noun_1084369_cc.svg")));
 		tooltipText = "Revert patch";
 	}
 	void onAction(EventAction &e) override {
@@ -81,7 +81,7 @@ struct RevertButton : TooltipIconButton {
 
 struct DisconnectCablesButton : TooltipIconButton {
 	DisconnectCablesButton() {
-		setSVG(SVG::load(assetGlobal("res/icons/noun_1745061_cc.svg")));
+		setSVG(SVG::load(asset::global("res/icons/noun_1745061_cc.svg")));
 		tooltipText = "Disconnect cables";
 	}
 	void onAction(EventAction &e) override {
@@ -91,7 +91,7 @@ struct DisconnectCablesButton : TooltipIconButton {
 
 struct PowerMeterButton : TooltipIconButton {
 	PowerMeterButton() {
-		setSVG(SVG::load(assetGlobal("res/icons/noun_305536_cc.svg")));
+		setSVG(SVG::load(asset::global("res/icons/noun_305536_cc.svg")));
 		tooltipText = "Toggle power meter (see manual for explanation)";
 	}
 	void onAction(EventAction &e) override {
@@ -115,7 +115,7 @@ struct SampleRateItem : MenuItem {
 
 struct SampleRateButton : TooltipIconButton {
 	SampleRateButton() {
-		setSVG(SVG::load(assetGlobal("res/icons/noun_1240789_cc.svg")));
+		setSVG(SVG::load(asset::global("res/icons/noun_1240789_cc.svg")));
 		tooltipText = "Engine sample rate";
 	}
 	void onAction(EventAction &e) override {
@@ -142,7 +142,7 @@ struct SampleRateButton : TooltipIconButton {
 
 struct RackLockButton : TooltipIconButton {
 	RackLockButton() {
-		setSVG(SVG::load(assetGlobal("res/icons/noun_468341_cc.svg")));
+		setSVG(SVG::load(asset::global("res/icons/noun_468341_cc.svg")));
 		tooltipText = "Lock modules";
 	}
 	void onAction(EventAction &e) override {
@@ -204,7 +204,7 @@ Toolbar::Toolbar() {
 	layout->addChild(zoomSlider);
 
 	// Kind of hacky, but display the PluginManagerWidget only if the local directory is not the development directory
-	if (assetLocal("") != "./") {
+	if (asset::local("") != "./") {
 		Widget *pluginManager = new PluginManagerWidget();
 		layout->addChild(pluginManager);
 	}

src/asset.cpp

@@ -21,16 +21,17 @@
 
 
 namespace rack {
+namespace asset {
 
 
-std::string assetGlobalDir;
-std::string assetLocalDir;
+std::string globalDir;
+std::string localDir;
 
 
-void assetInit(bool devMode) {
-	if (assetGlobalDir.empty()) {
+void init(bool devMode) {
+	if (globalDir.empty()) {
 		if (devMode) {
-			assetGlobalDir = ".";
+			globalDir = ".";
 		}
 		else {
 #if ARCH_MAC
@@ -41,25 +42,25 @@ void assetInit(bool devMode) {
 			Boolean success = CFURLGetFileSystemRepresentation(resourcesUrl, TRUE, (UInt8*) resourcesBuf, sizeof(resourcesBuf));
 			assert(success);
 			CFRelease(resourcesUrl);
-			assetGlobalDir = resourcesBuf;
+			globalDir = resourcesBuf;
 #endif
 #if ARCH_WIN
 			char moduleBuf[MAX_PATH];
 			DWORD length = GetModuleFileName(NULL, moduleBuf, sizeof(moduleBuf));
 			assert(length > 0);
 			PathRemoveFileSpec(moduleBuf);
-			assetGlobalDir = moduleBuf;
+			globalDir = moduleBuf;
 #endif
 #if ARCH_LIN
 			// TODO For now, users should launch Rack from their terminal in the global directory
-			assetGlobalDir = ".";
+			globalDir = ".";
 #endif
 		}
 	}
 
-	if (assetLocalDir.empty()) {
+	if (localDir.empty()) {
 		if (devMode) {
-			assetLocalDir = ".";
+			localDir = ".";
 		}
 		else {
 #if ARCH_WIN
@@ -67,15 +68,15 @@ void assetInit(bool devMode) {
 			char documentsBuf[MAX_PATH];
 			HRESULT result = SHGetFolderPath(NULL, CSIDL_MYDOCUMENTS, NULL, SHGFP_TYPE_CURRENT, documentsBuf);
 			assert(result == S_OK);
-			assetLocalDir = documentsBuf;
-			assetLocalDir += "/Rack";
+			localDir = documentsBuf;
+			localDir += "/Rack";
 #endif
 #if ARCH_MAC
 			// Get home directory
 			struct passwd *pw = getpwuid(getuid());
 			assert(pw);
-			assetLocalDir = pw->pw_dir;
-			assetLocalDir += "/Documents/Rack";
+			localDir = pw->pw_dir;
+			localDir += "/Documents/Rack";
 #endif
 #if ARCH_LIN
 			// Get home directory
@@ -85,31 +86,32 @@ void assetInit(bool devMode) {
 				assert(pw);
 				homeBuf = pw->pw_dir;
 			}
-			assetLocalDir = homeBuf;
-			assetLocalDir += "/.Rack";
+			localDir = homeBuf;
+			localDir += "/.Rack";
 #endif
 		}
 	}
 
-	systemCreateDirectory(assetGlobalDir);
-	systemCreateDirectory(assetLocalDir);
+	systemCreateDirectory(globalDir);
+	systemCreateDirectory(localDir);
 }
 
 
-std::string assetGlobal(std::string filename) {
-	return assetGlobalDir + "/" + filename;
+std::string global(std::string filename) {
+	return globalDir + "/" + filename;
 }
 
 
-std::string assetLocal(std::string filename) {
-	return assetLocalDir + "/" + filename;
+std::string local(std::string filename) {
+	return localDir + "/" + filename;
 }
 
 
-std::string assetPlugin(Plugin *plugin, std::string filename) {
+std::string plugin(Plugin *plugin, std::string filename) {
 	assert(plugin);
 	return plugin->path + "/" + filename;
 }
 
 
+} // namespace asset
 } // namespace rack

src/logger.cpp

@@ -18,7 +18,7 @@ void init(bool devMode) {
 		outputFile = stderr;
 	}
 	else {
-		std::string logFilename = assetLocal("log.txt");
+		std::string logFilename = asset::local("log.txt");
 		outputFile = fopen(logFilename.c_str(), "w");
 	}
 }

src/main.cpp

@@ -35,10 +35,10 @@ int main(int argc, char* argv[]) {
 				devMode = true;
 			} break;
 			case 'g': {
-				assetGlobalDir = optarg;
+				asset::globalDir = optarg;
 			} break;
 			case 'l': {
-				assetLocalDir = optarg;
+				asset::localDir = optarg;
 			} break;
 			default: break;
 		}
@@ -60,15 +60,15 @@ int main(int argc, char* argv[]) {
 
 	// Initialize environment
 	randomInit();
-	assetInit(devMode);
+	asset::init(devMode);
 	logger::init(devMode);
 
 	// Log environment
 	info("%s %s", gApplicationName.c_str(), gApplicationVersion.c_str());
 	if (devMode)
 		info("Development mode");
-	info("Global directory: %s", assetGlobal("").c_str());
-	info("Local directory: %s", assetLocal("").c_str());
+	info("Global directory: %s", asset::global("").c_str());
+	info("Local directory: %s", asset::local("").c_str());
 
 	// Initialize app
 	pluginInit(devMode);
@@ -79,13 +79,13 @@ int main(int argc, char* argv[]) {
 	gamepadInit();
 	windowInit();
 	appInit(devMode);
-	settingsLoad(assetLocal("settings.json"));
+	settingsLoad(asset::local("settings.json"));
 
 	if (patchFile.empty()) {
 		// To prevent launch crashes, if Rack crashes between now and 15 seconds from now, the "skipAutosaveOnLaunch" property will remain in settings.json, so that in the next launch, the broken autosave will not be loaded.
 		bool oldSkipAutosaveOnLaunch = gSkipAutosaveOnLaunch;
 		gSkipAutosaveOnLaunch = true;
-		settingsSave(assetLocal("settings.json"));
+		settingsSave(asset::local("settings.json"));
 		gSkipAutosaveOnLaunch = false;
 		if (oldSkipAutosaveOnLaunch && osdialog_message(OSDIALOG_INFO, OSDIALOG_YES_NO, "Rack has recovered from a crash, possibly caused by a faulty module in your patch. Clear your patch and start over?")) {
 			gRackWidget->lastPath = "";
@@ -93,7 +93,7 @@ int main(int argc, char* argv[]) {
 		else {
 			// Load autosave
 			std::string oldLastPath = gRackWidget->lastPath;
-			gRackWidget->load(assetLocal("autosave.vcv"));
+			gRackWidget->load(asset::local("autosave.vcv"));
 			gRackWidget->lastPath = oldLastPath;
 		}
 	}
@@ -108,8 +108,8 @@ int main(int argc, char* argv[]) {
 	engineStop();
 
 	// Destroy namespaces
-	gRackWidget->save(assetLocal("autosave.vcv"));
-	settingsSave(assetLocal("settings.json"));
+	gRackWidget->save(asset::local("autosave.vcv"));
+	settingsSave(asset::local("settings.json"));
 	appDestroy();
 	windowDestroy();
 	bridgeDestroy();

src/plugin.cpp

@@ -199,7 +199,7 @@ static bool syncPlugin(std::string slug, json_t *manifestJ, bool dryRun) {
 		info("Downloading plugin %s %s %s", slug.c_str(), latestVersion.c_str(), arch.c_str());
 
 		// Download zip
-		std::string pluginDest = assetLocal("plugins/" + slug + ".zip");
+		std::string pluginDest = asset::local("plugins/" + slug + ".zip");
 		if (!requestDownload(downloadUrl, pluginDest, &downloadProgress)) {
 			warn("Plugin %s download was unsuccessful", slug.c_str());
 			return false;
@@ -331,14 +331,14 @@ void pluginInit(bool devMode) {
 	gPlugins.push_back(corePlugin);
 
 	// Get local plugins directory
-	std::string localPlugins = assetLocal("plugins");
+	std::string localPlugins = asset::local("plugins");
 	mkdir(localPlugins.c_str(), 0755);
 
 	if (!devMode) {
 		// Copy Fundamental package to plugins directory if folder does not exist
-		std::string fundamentalSrc = assetGlobal("Fundamental.zip");
-		std::string fundamentalDest = assetLocal("plugins/Fundamental.zip");
-		std::string fundamentalDir = assetLocal("plugins/Fundamental");
+		std::string fundamentalSrc = asset::global("Fundamental.zip");
+		std::string fundamentalDest = asset::local("plugins/Fundamental.zip");
+		std::string fundamentalDir = asset::local("plugins/Fundamental");
 		if (systemIsFile(fundamentalSrc) && !systemIsFile(fundamentalDest) && !systemIsDirectory(fundamentalDir)) {
 			systemCopy(fundamentalSrc, fundamentalDest);
 		}

src/window.cpp

@@ -401,7 +401,7 @@ void windowInit() {
 	assert(gFramebufferVg);
 
 	// Set up Blendish
-	gGuiFont = Font::load(assetGlobal("res/fonts/DejaVuSans.ttf"));
+	gGuiFont = Font::load(asset::global("res/fonts/DejaVuSans.ttf"));
 	bndSetFont(gGuiFont->handle);
 
 	windowSetTheme(nvgRGB(0x33, 0x33, 0x33), nvgRGB(0xf0, 0xf0, 0xf0));