Create `plugin::` namespace

include/app.hpp

@@ -2,6 +2,10 @@
 #include "common.hpp"
 
 
+/** Accesses the global App pointer */
+#define APP rack::app::get()
+
+
 namespace rack {
 
 
@@ -45,9 +49,5 @@ void destroy();
 App *get();
 
 
-/** Accesses the global App pointer */
-#define APP rack::app::get()
-
-
 } // namespace app
 } // namespace rack

include/app/ModuleWidget.hpp

@@ -13,7 +13,7 @@ namespace app {
 
 
 struct ModuleWidget : widget::OpaqueWidget {
-	Model *model = NULL;
+	plugin::Model *model = NULL;
 	/** Owns the module pointer */
 	Module *module = NULL;
 

include/asset.hpp

@@ -4,7 +4,11 @@
 
 namespace rack {
 
-struct Plugin;
+
+namespace plugin {
+	struct Plugin;
+} // namespace plugin
+
 
 namespace asset {
 
@@ -15,7 +19,7 @@ std::string system(std::string filename);
 /** Returns the path of a user resource. Can read and write files to this location. */
 std::string user(std::string filename);
 /** Returns the path of a resource in the plugin's folder. Should only read files from this location. */
-std::string plugin(Plugin *plugin, std::string filename);
+std::string plugin(plugin::Plugin *plugin, std::string filename);
 
 
 extern std::string systemDir;

include/helpers.hpp

@@ -15,8 +15,8 @@ namespace rack {
 
 
 template <class TModule, class TModuleWidget, typename... Tags>
-Model *createModel(std::string slug) {
-	struct TModel : Model {
+plugin::Model *createModel(std::string slug) {
+	struct TModel : plugin::Model {
 		Module *createModule() override {
 			TModule *o = new TModule;
 			return o;
@@ -34,7 +34,7 @@ Model *createModel(std::string slug) {
 		}
 	};
 
-	Model *o = new TModel;
+	plugin::Model *o = new TModel;
 	o->slug = slug;
 	return o;
 }

include/history.hpp

@@ -57,7 +57,7 @@ struct ModuleAction : Action {
 
 
 struct ModuleAdd : ModuleAction {
-	Model *model;
+	plugin::Model *model;
 	math::Vec pos;
 	json_t *moduleJ;
 	~ModuleAdd();

include/logger.hpp

@@ -1,6 +1,17 @@
 #pragma once
 
 
+/** Example usage:
+	DEBUG("error: %d", errno);
+will print something like
+	[0.123 debug myfile.cpp:45] error: 67
+*/
+#define DEBUG(format, ...) rack::logger::log(rack::logger::DEBUG_LEVEL, __FILE__, __LINE__, format, ##__VA_ARGS__)
+#define INFO(format, ...) rack::logger::log(rack::logger::INFO_LEVEL, __FILE__, __LINE__, format, ##__VA_ARGS__)
+#define WARN(format, ...) rack::logger::log(rack::logger::WARN_LEVEL, __FILE__, __LINE__, format, ##__VA_ARGS__)
+#define FATAL(format, ...) rack::logger::log(rack::logger::FATAL_LEVEL, __FILE__, __LINE__, format, ##__VA_ARGS__)
+
+
 namespace rack {
 namespace logger {
 
@@ -18,16 +29,5 @@ void destroy();
 void log(Level level, const char *filename, int line, const char *format, ...);
 
 
-/** Example usage:
-	DEBUG("error: %d", errno);
-will print something like
-	[0.123 debug myfile.cpp:45] error: 67
-*/
-#define DEBUG(format, ...) rack::logger::log(rack::logger::DEBUG_LEVEL, __FILE__, __LINE__, format, ##__VA_ARGS__)
-#define INFO(format, ...) rack::logger::log(rack::logger::INFO_LEVEL, __FILE__, __LINE__, format, ##__VA_ARGS__)
-#define WARN(format, ...) rack::logger::log(rack::logger::WARN_LEVEL, __FILE__, __LINE__, format, ##__VA_ARGS__)
-#define FATAL(format, ...) rack::logger::log(rack::logger::FATAL_LEVEL, __FILE__, __LINE__, format, ##__VA_ARGS__)
-
-
 } // namespace logger
 } // namespace rack

include/plugin/Model.hpp

@@ -12,9 +12,13 @@ namespace app {
 	struct ModuleWidget;
 } // namespace app
 
+
 struct Module;
 
 
+namespace plugin {
+
+
 struct Model {
 	Plugin *plugin = NULL;
 
@@ -41,4 +45,5 @@ struct Model {
 };
 
 
+} // namespace plugin
 } // namespace rack

include/plugin/Plugin.hpp

@@ -5,6 +5,7 @@
 
 
 namespace rack {
+namespace plugin {
 
 
 struct Model;
@@ -46,4 +47,5 @@ struct Plugin {
 };
 
 
+} // namespace plugin
 } // namespace rack

include/plugin/callbacks.hpp

@@ -6,4 +6,4 @@
 You must implement this in your plugin
 */
 extern "C"
-void init(rack::Plugin *plugin);
+void init(rack::plugin::Plugin *plugin);

include/rack.hpp

@@ -97,6 +97,8 @@ using namespace math;
 using namespace widget;
 using namespace ui;
 using namespace app;
+using plugin::Plugin;
+using plugin::Model;
 
 
 } // namespace rack

plugin.mk

@@ -10,7 +10,6 @@ DISTRIBUTABLES += plugin.json
 FLAGS += -fPIC
 FLAGS += -I$(RACK_DIR)/include -I$(RACK_DIR)/dep/include
 
-
 include $(RACK_DIR)/arch.mk
 
 ifdef ARCH_LIN

src/app/ModuleBrowser.cpp

@@ -21,7 +21,7 @@ namespace rack {
 namespace app {
 
 
-static std::set<Model*> sFavoriteModels;
+static std::set<plugin::Model*> sFavoriteModels;
 
 
 struct BrowserOverlay : widget::OpaqueWidget {
@@ -57,13 +57,13 @@ struct BrowserOverlay : widget::OpaqueWidget {
 
 
 struct ModuleBox : widget::OpaqueWidget {
-	Model *model;
+	plugin::Model *model;
 	/** Lazily created */
 	widget::Widget *previewWidget = NULL;
 	/** Number of frames since draw() has been called */
 	int visibleFrames = 0;
 
-	void setModel(Model *model) {
+	void setModel(plugin::Model *model) {
 		this->model = model;
 
 		box.size.x = 70.f;
@@ -173,8 +173,8 @@ struct ModuleBrowser : widget::OpaqueWidget {
 		moduleLayout->spacing = math::Vec(10, 10);
 		moduleScroll->container->addChild(moduleLayout);
 
-		for (Plugin *plugin : plugin::plugins) {
-			for (Model *model : plugin->models) {
+		for (plugin::Plugin *plugin : plugin::plugins) {
+			for (plugin::Model *model : plugin->models) {
 				ModuleBox *moduleBox = new ModuleBox;
 				moduleBox->setModel(model);
 				moduleLayout->addChild(moduleBox);
@@ -244,7 +244,7 @@ json_t *moduleBrowserToJson() {
 	json_t *rootJ = json_object();
 
 	json_t *favoritesJ = json_array();
-	for (Model *model : sFavoriteModels) {
+	for (plugin::Model *model : sFavoriteModels) {
 		json_t *modelJ = json_object();
 		json_object_set_new(modelJ, "plugin", json_string(model->plugin->slug.c_str()));
 		json_object_set_new(modelJ, "model", json_string(model->slug.c_str()));
@@ -267,7 +267,7 @@ void moduleBrowserFromJson(json_t *rootJ) {
 				continue;
 			std::string pluginSlug = json_string_value(pluginJ);
 			std::string modelSlug = json_string_value(modelJ);
-			Model *model = plugin::getModel(pluginSlug, modelSlug);
+			plugin::Model *model = plugin::getModel(pluginSlug, modelSlug);
 			if (!model)
 				continue;
 			sFavoriteModels.insert(model);

src/app/RackWidget.cpp

@@ -30,7 +30,7 @@ static ModuleWidget *moduleFromJson(json_t *moduleJ) {
 	std::string modelSlug = json_string_value(modelSlugJ);
 
 	// Get Model
-	Model *model = plugin::getModel(pluginSlug, modelSlug);
+	plugin::Model *model = plugin::getModel(pluginSlug, modelSlug);
 	if (!model)
 		return NULL;
 

src/asset.cpp

@@ -105,7 +105,7 @@ std::string user(std::string filename) {
 }
 
 
-std::string plugin(Plugin *plugin, std::string filename) {
+std::string plugin(plugin::Plugin *plugin, std::string filename) {
 	assert(plugin);
 	return plugin->path + "/" + filename;
 }

src/plugin/Model.cpp

@@ -2,6 +2,7 @@
 
 
 namespace rack {
+namespace plugin {
 
 
 void Model::fromJson(json_t *rootJ) {
@@ -25,4 +26,5 @@ void Model::fromJson(json_t *rootJ) {
 }
 
 
+} // namespace plugin
 } // namespace rack

src/plugin/Plugin.cpp

@@ -3,6 +3,7 @@
 
 
 namespace rack {
+namespace plugin {
 
 
 Plugin::~Plugin() {
@@ -88,4 +89,5 @@ void Plugin::fromJson(json_t *rootJ) {
 }
 
 
+} // namespace plugin
 } // namespace rack