From 3f8b5ad0558a44129cab8d48fa4479cfe6f99cf5 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Thu, 16 Feb 2017 05:50:33 -0500 Subject: [PATCH] Renamed scene.hpp to app.hpp, moved app stuff to src/app --- include/{scene.hpp => app.hpp} | 0 include/components.hpp | 2 +- include/gui.hpp | 2 +- include/rack.hpp | 2 +- src/{scene.cpp => app.cpp} | 2 +- src/{widgets => app}/Knob.cpp | 2 +- src/{widgets => app}/Light.cpp | 2 +- src/{widgets => app}/ModuleWidget.cpp | 2 +- src/{widgets => app}/Panel.cpp | 2 +- src/{widgets => app}/ParamWidget.cpp | 2 +- src/{widgets => app}/Port.cpp | 2 +- src/{widgets => app}/RackScene.cpp | 2 +- src/{widgets => app}/RackWidget.cpp | 2 +- src/{widgets => app}/SVGKnob.cpp | 2 +- src/{widgets => app}/SpriteKnob.cpp | 2 +- src/{widgets => app}/Toolbar.cpp | 2 +- src/{widgets => app}/WireWidget.cpp | 2 +- src/gui.cpp | 2 +- src/main.cpp | 2 +- src/widgets/MenuOverlay.cpp | 1 + src/widgets/TransformWidget.cpp | 2 +- 21 files changed, 20 insertions(+), 19 deletions(-) rename include/{scene.hpp => app.hpp} (100%) rename src/{scene.cpp => app.cpp} (92%) rename src/{widgets => app}/Knob.cpp (93%) rename src/{widgets => app}/Light.cpp (97%) rename src/{widgets => app}/ModuleWidget.cpp (99%) rename src/{widgets => app}/Panel.cpp (96%) rename src/{widgets => app}/ParamWidget.cpp (95%) rename src/{widgets => app}/Port.cpp (99%) rename src/{widgets => app}/RackScene.cpp (96%) rename src/{widgets => app}/RackWidget.cpp (99%) rename src/{widgets => app}/SVGKnob.cpp (97%) rename src/{widgets => app}/SpriteKnob.cpp (88%) rename src/{widgets => app}/Toolbar.cpp (99%) rename src/{widgets => app}/WireWidget.cpp (99%) diff --git a/include/scene.hpp b/include/app.hpp similarity index 100% rename from include/scene.hpp rename to include/app.hpp diff --git a/include/components.hpp b/include/components.hpp index 2a88e850..0c7f7c7d 100644 --- a/include/components.hpp +++ b/include/components.hpp @@ -1,5 +1,5 @@ #pragma once -#include "scene.hpp" +#include "app.hpp" namespace rack { diff --git a/include/gui.hpp b/include/gui.hpp index a634366d..b25488da 100644 --- a/include/gui.hpp +++ b/include/gui.hpp @@ -1,5 +1,5 @@ #pragma once -#include "scene.hpp" +#include "app.hpp" namespace rack { diff --git a/include/rack.hpp b/include/rack.hpp index b87c5007..ffe06f24 100644 --- a/include/rack.hpp +++ b/include/rack.hpp @@ -5,7 +5,7 @@ #include "plugin.hpp" #include "engine.hpp" #include "gui.hpp" -#include "scene.hpp" +#include "app.hpp" #include "components.hpp" #include "dsp.hpp" diff --git a/src/scene.cpp b/src/app.cpp similarity index 92% rename from src/scene.cpp rename to src/app.cpp index 7e1f30ef..1651a6c1 100644 --- a/src/scene.cpp +++ b/src/app.cpp @@ -1,4 +1,4 @@ -#include "scene.hpp" +#include "app.hpp" namespace rack { diff --git a/src/widgets/Knob.cpp b/src/app/Knob.cpp similarity index 93% rename from src/widgets/Knob.cpp rename to src/app/Knob.cpp index 72628cf4..5a6297b8 100644 --- a/src/widgets/Knob.cpp +++ b/src/app/Knob.cpp @@ -1,4 +1,4 @@ -#include "scene.hpp" +#include "app.hpp" #include "gui.hpp" diff --git a/src/widgets/Light.cpp b/src/app/Light.cpp similarity index 97% rename from src/widgets/Light.cpp rename to src/app/Light.cpp index 3d9b6c7d..68479ce7 100644 --- a/src/widgets/Light.cpp +++ b/src/app/Light.cpp @@ -1,4 +1,4 @@ -#include "scene.hpp" +#include "app.hpp" namespace rack { diff --git a/src/widgets/ModuleWidget.cpp b/src/app/ModuleWidget.cpp similarity index 99% rename from src/widgets/ModuleWidget.cpp rename to src/app/ModuleWidget.cpp index bae823d8..524b14d4 100644 --- a/src/widgets/ModuleWidget.cpp +++ b/src/app/ModuleWidget.cpp @@ -1,4 +1,4 @@ -#include "scene.hpp" +#include "app.hpp" #include "engine.hpp" #include "plugin.hpp" diff --git a/src/widgets/Panel.cpp b/src/app/Panel.cpp similarity index 96% rename from src/widgets/Panel.cpp rename to src/app/Panel.cpp index 131c26a9..665cda9c 100644 --- a/src/widgets/Panel.cpp +++ b/src/app/Panel.cpp @@ -1,4 +1,4 @@ -#include "scene.hpp" +#include "app.hpp" namespace rack { diff --git a/src/widgets/ParamWidget.cpp b/src/app/ParamWidget.cpp similarity index 95% rename from src/widgets/ParamWidget.cpp rename to src/app/ParamWidget.cpp index 7a1d35c0..7b3fca88 100644 --- a/src/widgets/ParamWidget.cpp +++ b/src/app/ParamWidget.cpp @@ -1,4 +1,4 @@ -#include "scene.hpp" +#include "app.hpp" #include "engine.hpp" diff --git a/src/widgets/Port.cpp b/src/app/Port.cpp similarity index 99% rename from src/widgets/Port.cpp rename to src/app/Port.cpp index 1d9cfd97..67edaf3b 100644 --- a/src/widgets/Port.cpp +++ b/src/app/Port.cpp @@ -1,4 +1,4 @@ -#include "scene.hpp" +#include "app.hpp" namespace rack { diff --git a/src/widgets/RackScene.cpp b/src/app/RackScene.cpp similarity index 96% rename from src/widgets/RackScene.cpp rename to src/app/RackScene.cpp index 7d5c3044..9c984052 100644 --- a/src/widgets/RackScene.cpp +++ b/src/app/RackScene.cpp @@ -1,4 +1,4 @@ -#include "scene.hpp" +#include "app.hpp" #include "gui.hpp" diff --git a/src/widgets/RackWidget.cpp b/src/app/RackWidget.cpp similarity index 99% rename from src/widgets/RackWidget.cpp rename to src/app/RackWidget.cpp index 6c2818d8..8e7ec62f 100644 --- a/src/widgets/RackWidget.cpp +++ b/src/app/RackWidget.cpp @@ -1,6 +1,6 @@ #include #include -#include "scene.hpp" +#include "app.hpp" #include "engine.hpp" #include "plugin.hpp" #include "gui.hpp" diff --git a/src/widgets/SVGKnob.cpp b/src/app/SVGKnob.cpp similarity index 97% rename from src/widgets/SVGKnob.cpp rename to src/app/SVGKnob.cpp index c0238d88..be48ae29 100644 --- a/src/widgets/SVGKnob.cpp +++ b/src/app/SVGKnob.cpp @@ -1,4 +1,4 @@ -#include "scene.hpp" +#include "app.hpp" namespace rack { diff --git a/src/widgets/SpriteKnob.cpp b/src/app/SpriteKnob.cpp similarity index 88% rename from src/widgets/SpriteKnob.cpp rename to src/app/SpriteKnob.cpp index 8ee6fb34..eb55e911 100644 --- a/src/widgets/SpriteKnob.cpp +++ b/src/app/SpriteKnob.cpp @@ -1,4 +1,4 @@ -#include "scene.hpp" +#include "app.hpp" namespace rack { diff --git a/src/widgets/Toolbar.cpp b/src/app/Toolbar.cpp similarity index 99% rename from src/widgets/Toolbar.cpp rename to src/app/Toolbar.cpp index 5cd0d117..04bc619f 100644 --- a/src/widgets/Toolbar.cpp +++ b/src/app/Toolbar.cpp @@ -1,4 +1,4 @@ -#include "scene.hpp" +#include "app.hpp" #include "gui.hpp" #include "engine.hpp" diff --git a/src/widgets/WireWidget.cpp b/src/app/WireWidget.cpp similarity index 99% rename from src/widgets/WireWidget.cpp rename to src/app/WireWidget.cpp index 35b8bcd1..4eff3deb 100644 --- a/src/widgets/WireWidget.cpp +++ b/src/app/WireWidget.cpp @@ -1,4 +1,4 @@ -#include "scene.hpp" +#include "app.hpp" #include "engine.hpp" diff --git a/src/gui.cpp b/src/gui.cpp index 85d68865..30782bf0 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -4,7 +4,7 @@ #include #include "gui.hpp" -#include "scene.hpp" +#include "app.hpp" // #define NANOVG_GL2_IMPLEMENTATION #define NANOVG_GL3_IMPLEMENTATION diff --git a/src/main.cpp b/src/main.cpp index 4fb59fef..159c9b6f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -6,7 +6,7 @@ #include "engine.hpp" #include "gui.hpp" -#include "scene.hpp" +#include "app.hpp" #include "plugin.hpp" diff --git a/src/widgets/MenuOverlay.cpp b/src/widgets/MenuOverlay.cpp index 5192219a..72c4bcbd 100644 --- a/src/widgets/MenuOverlay.cpp +++ b/src/widgets/MenuOverlay.cpp @@ -1,5 +1,6 @@ #include "widgets.hpp" + namespace rack { void MenuOverlay::step() { diff --git a/src/widgets/TransformWidget.cpp b/src/widgets/TransformWidget.cpp index a7092064..ebf0dc08 100644 --- a/src/widgets/TransformWidget.cpp +++ b/src/widgets/TransformWidget.cpp @@ -1,4 +1,4 @@ -#include "scene.hpp" +#include "widgets.hpp" namespace rack {