Rename App to Context and app.hpp to context.hpp. The APP macro is still valid.

include/app/Knob.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include <app/common.hpp>
 #include <app/ParamWidget.hpp>
-#include <app.hpp>
+#include <context.hpp>
 
 
 namespace rack {

include/app/SvgPanel.hpp

@@ -3,7 +3,7 @@
 #include <widget/TransparentWidget.hpp>
 #include <widget/FramebufferWidget.hpp>
 #include <widget/SvgWidget.hpp>
-#include <app.hpp>
+#include <context.hpp>
 
 
 namespace rack {

include/app.hpp → include/context.hpp

@@ -30,7 +30,7 @@ struct Scene;
 
 
 /** Contains the application state  */
-struct App {
+struct Context {
 	event::State* event = NULL;
 	app::Scene* scene = NULL;
 	engine::Engine* engine = NULL;
@@ -39,17 +39,17 @@ struct App {
 	PatchManager* patch = NULL;
 
 	void init();
-	~App();
+	~Context();
 };
 
 
-void appInit();
-void appDestroy();
-/** Returns the global App pointer */
-App* appGet();
+void contextInit();
+void contextDestroy();
+/** Returns the global Context pointer */
+Context* contextGet();
 
-/** Accesses the global App pointer */
-#define APP rack::appGet()
+/** Accesses the global Context pointer */
+#define APP rack::contextGet()
 
 
 } // namespace rack

include/helpers.hpp

@@ -11,7 +11,7 @@
 #include <app/SvgPanel.hpp>
 #include <engine/Module.hpp>
 #include <engine/ParamQuantity.hpp>
-#include <app.hpp>
+#include <context.hpp>
 
 
 namespace rack {

include/rack.hpp

@@ -11,7 +11,7 @@
 #include <network.hpp>
 #include <asset.hpp>
 #include <window.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <midi.hpp>
 #include <settings.hpp>
 #include <helpers.hpp>

include/ui/MenuItem.hpp

@@ -2,7 +2,7 @@
 #include <ui/common.hpp>
 #include <ui/Menu.hpp>
 #include <ui/MenuEntry.hpp>
-#include <app.hpp>
+#include <context.hpp>
 
 
 namespace rack {

include/ui/RadioButton.hpp

@@ -2,7 +2,7 @@
 #include <ui/common.hpp>
 #include <widget/OpaqueWidget.hpp>
 #include <Quantity.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <event.hpp>
 
 

include/ui/Slider.hpp

@@ -2,7 +2,7 @@
 #include <widget/OpaqueWidget.hpp>
 #include <Quantity.hpp>
 #include <ui/common.hpp>
-#include <app.hpp>
+#include <context.hpp>
 
 
 namespace rack {

include/ui/TextField.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include <widget/OpaqueWidget.hpp>
 #include <ui/common.hpp>
-#include <app.hpp>
+#include <context.hpp>
 
 
 namespace rack {

src/app/CableWidget.cpp

@@ -2,7 +2,7 @@
 #include <app/Scene.hpp>
 #include <app/RackWidget.hpp>
 #include <window.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <patch.hpp>
 #include <settings.hpp>
 #include <engine/Engine.hpp>

src/app/Knob.cpp

@@ -1,5 +1,5 @@
 #include <app/Knob.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <app/Scene.hpp>
 #include <random.hpp>
 #include <history.hpp>

src/app/LedDisplay.cpp

@@ -1,7 +1,7 @@
 #include <app/LedDisplay.hpp>
 #include <asset.hpp>
 #include <window.hpp>
-#include <app.hpp>
+#include <context.hpp>
 
 
 namespace rack {

src/app/MenuBar.cpp

@@ -10,7 +10,7 @@
 #include <ui/TextField.hpp>
 #include <ui/PasswordField.hpp>
 #include <ui/ProgressBar.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <settings.hpp>
 #include <helpers.hpp>
 #include <system.hpp>

src/app/ModuleBrowser.cpp

@@ -17,7 +17,7 @@
 #include <app/ModuleWidget.hpp>
 #include <app/Scene.hpp>
 #include <plugin.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <engine/Engine.hpp>
 #include <plugin/Model.hpp>
 #include <string.hpp>

src/app/ModuleWidget.cpp

@@ -7,7 +7,7 @@
 #include <system.hpp>
 #include <asset.hpp>
 #include <helpers.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <settings.hpp>
 #include <history.hpp>
 #include <string.hpp>

src/app/ParamWidget.cpp

@@ -2,7 +2,7 @@
 #include <ui/MenuOverlay.hpp>
 #include <ui/TextField.hpp>
 #include <app/Scene.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <engine/Engine.hpp>
 #include <settings.hpp>
 #include <history.hpp>

src/app/PortWidget.cpp

@@ -1,7 +1,7 @@
 #include <app/PortWidget.hpp>
 #include <app/Scene.hpp>
 #include <window.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <history.hpp>
 #include <engine/Engine.hpp>
 #include <settings.hpp>

src/app/RackRail.cpp

@@ -1,5 +1,5 @@
 #include <app/RackRail.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <asset.hpp>
 #include <svg.hpp>
 

src/app/RackScrollWidget.cpp

@@ -1,7 +1,7 @@
 #include <app/RackScrollWidget.hpp>
 #include <app/Scene.hpp>
 #include <window.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <settings.hpp>
 
 

src/app/RackWidget.cpp

@@ -6,7 +6,7 @@
 #include <settings.hpp>
 #include <plugin.hpp>
 #include <engine/Engine.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <asset.hpp>
 #include <patch.hpp>
 #include <osdialog.h>

src/app/Scene.cpp

@@ -1,6 +1,6 @@
 #include <app/Scene.hpp>
 #include <app/ModuleBrowser.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <system.hpp>
 #include <network.hpp>
 #include <history.hpp>

src/app/Switch.cpp

@@ -1,5 +1,5 @@
 #include <app/Switch.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <app/Scene.hpp>
 #include <random.hpp>
 #include <history.hpp>

src/app.cpp → src/context.cpp

@@ -1,4 +1,4 @@
-#include <app.hpp>
+#include <context.hpp>
 #include <window.hpp>
 #include <patch.hpp>
 #include <engine/Engine.hpp>
@@ -10,7 +10,7 @@
 namespace rack {
 
 
-void App::init() {
+void Context::init() {
 	engine = new engine::Engine;
 	patch = new PatchManager;
 	if (!settings::headless) {
@@ -22,7 +22,7 @@ void App::init() {
 	}
 }
 
-App::~App() {
+Context::~Context() {
 	// Set pointers to NULL so other objects will segfault when attempting to access them
 	if (scene)
 		delete scene;
@@ -45,22 +45,22 @@ App::~App() {
 }
 
 
-static App* appInstance = NULL;
+static Context* context = NULL;
 
-void appInit() {
-	assert(!appInstance);
-	appInstance = new App;
-	appInstance->init();
+void contextInit() {
+	assert(!context);
+	context = new Context;
+	context->init();
 }
 
-void appDestroy() {
-	assert(appInstance);
-	delete appInstance;
-	appInstance = NULL;
+void contextDestroy() {
+	assert(context);
+	delete context;
+	context = NULL;
 }
 
-App* appGet() {
-	return appInstance;
+Context* contextGet() {
+	return context;
 }
 
 

src/core/AudioInterface.cpp

@@ -1,6 +1,6 @@
 #include "plugin.hpp"
 #include <audio.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <mutex>
 #include <chrono>
 #include <thread>

src/core/Blank.cpp

@@ -1,5 +1,5 @@
 #include "plugin.hpp"
-#include <app.hpp>
+#include <context.hpp>
 
 
 namespace rack {

src/engine/Cable.cpp

@@ -1,6 +1,6 @@
 #include <engine/Cable.hpp>
 #include <engine/Engine.hpp>
-#include <app.hpp>
+#include <context.hpp>
 
 
 namespace rack {

src/engine/Engine.cpp

@@ -2,7 +2,7 @@
 #include <settings.hpp>
 #include <system.hpp>
 #include <random.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <patch.hpp>
 #include <plugin.hpp>
 

src/engine/ParamQuantity.cpp

@@ -1,5 +1,5 @@
 #include <engine/ParamQuantity.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <engine/Engine.hpp>
 
 

src/event.cpp

@@ -1,6 +1,6 @@
 #include <event.hpp>
 #include <widget/Widget.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <window.hpp>
 
 

src/history.cpp

@@ -1,5 +1,5 @@
 #include <history.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <app/Scene.hpp>
 #include <engine/Cable.hpp>
 #include <engine/Engine.hpp>

src/main.cpp

@@ -12,7 +12,7 @@
 #include <app/common.hpp>
 #include <app/Scene.hpp>
 #include <plugin.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <patch.hpp>
 #include <ui.hpp>
 #include <system.hpp>
@@ -172,7 +172,7 @@ int main(int argc, char* argv[]) {
 
 	// Initialize app
 	INFO("Initializing app");
-	appInit();
+	contextInit();
 
 	// On Mac, use a hacked-in GLFW addition to get the launched path.
 #if defined ARCH_MAC
@@ -206,7 +206,7 @@ int main(int argc, char* argv[]) {
 		APP->patch->save(asset::autosavePath);
 	}
 	INFO("Destroying app");
-	appDestroy();
+	contextDestroy();
 	if (!settings::headless) {
 		settings::save(asset::settingsPath);
 	}

src/patch.cpp

@@ -2,7 +2,7 @@
 #include <asset.hpp>
 #include <system.hpp>
 #include <engine/Engine.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <app/common.hpp>
 #include <app/Scene.hpp>
 #include <app/RackWidget.hpp>

src/plugin.cpp

@@ -3,7 +3,7 @@
 #include <network.hpp>
 #include <asset.hpp>
 #include <string.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <app/common.hpp>
 #include <plugin/callbacks.hpp>
 #include <settings.hpp>

src/settings.cpp

@@ -4,7 +4,7 @@
 #include <app/Scene.hpp>
 #include <app/ModuleBrowser.hpp>
 #include <engine/Engine.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <patch.hpp>
 #include <jansson.h>
 

src/ui/Button.cpp

@@ -1,5 +1,5 @@
 #include <ui/Button.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <event.hpp>
 
 

src/ui/ChoiceButton.cpp

@@ -1,5 +1,5 @@
 #include <ui/ChoiceButton.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <event.hpp>
 
 

src/ui/MenuLabel.cpp

@@ -1,5 +1,5 @@
 #include <ui/MenuLabel.hpp>
-#include <app.hpp>
+#include <context.hpp>
 
 
 namespace rack {

src/ui/ScrollBar.cpp

@@ -1,6 +1,6 @@
 #include <ui/ScrollBar.hpp>
 #include <ui/ScrollWidget.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <window.hpp>
 
 

src/ui/ScrollWidget.cpp

@@ -1,5 +1,5 @@
 #include <ui/ScrollWidget.hpp>
-#include <app.hpp>
+#include <context.hpp>
 
 
 namespace rack {

src/ui/Tooltip.cpp

@@ -1,5 +1,5 @@
 #include <ui/Tooltip.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <app/Scene.hpp>
 
 

src/updater.cpp

@@ -3,7 +3,7 @@
 #include <app/common.hpp>
 #include <network.hpp>
 #include <system.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <window.hpp>
 #include <asset.hpp>
 #include <thread>

src/widget/FramebufferWidget.cpp

@@ -1,5 +1,5 @@
 #include <widget/FramebufferWidget.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <random.hpp>
 
 

src/widget/OpenGlWidget.cpp

@@ -1,5 +1,5 @@
 #include <widget/OpenGlWidget.hpp>
-#include <app.hpp>
+#include <context.hpp>
 
 
 namespace rack {

src/widget/SvgWidget.cpp

@@ -1,5 +1,5 @@
 #include <widget/SvgWidget.hpp>
-#include <app.hpp>
+#include <context.hpp>
 
 
 namespace rack {

src/widget/Widget.cpp

@@ -1,5 +1,5 @@
 #include <widget/Widget.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <algorithm>
 
 

src/window.cpp

@@ -4,7 +4,7 @@
 #include <keyboard.hpp>
 #include <gamepad.hpp>
 #include <event.hpp>
-#include <app.hpp>
+#include <context.hpp>
 #include <patch.hpp>
 #include <settings.hpp>
 #include <plugin.hpp> // used in Window::screenshot