Merge pull request #410 from StoneyDSP/development

merge development

Author: nathanjhood

Makefile

@@ -133,6 +133,10 @@ STONEYVCV_BUILD_LFO ?= $(STONEYVCV_EXPERIMENTAL)
 
 SOURCES += src/StoneyVCV.cpp
 
+ifeq ($(STONEYVCV_EXPERIMENTAL),1)
+	FLAGS += -DSTONEYVCV_EXPERIMENTAL=$(STONEYVCV_EXPERIMENTAL)
+endif
+
 ifeq ($(STONEYVCV_BUILD_COMPONENTLIBRARY),1)
 	FLAGS += -DSTONEYVCV_BUILD_COMPONENTLIBRARY=$(STONEYVCV_BUILD_COMPONENTLIBRARY)
 	SOURCES += src/StoneyVCV/ComponentLibrary.cpp

VERSION

@@ -1 +1 @@
-2.0.1315.39643163383062
+2.0.1349.34376333316466

include/StoneyVCV.hpp

@@ -40,10 +40,16 @@
 //==============================================================================
 
 #ifdef STONEYDSP_DEBUG
-#include <iostream>
-#define DBG(msg, ...) do { ::std::cerr << std::string(msg, ##__VA_ARGS__) << std::endl; } while (0)
+ #include <iostream>
+ #define DBG(msg, ...) do { ::std::cerr << std::string(msg, ##__VA_ARGS__) << std::endl; } while (0)
 #else
-#define DBG(msg, ...) ::StoneyDSP::ignoreUnused(msg, ##__VA_ARGS__)
+ #define DBG(msg, ...) ::StoneyDSP::ignoreUnused(msg, ##__VA_ARGS__)
+#endif
+
+#ifdef STONEYDSP_DEBUG
+ #define assert_message(condition, message) assert((condition) && (message))
+#else
+ #define assert_message(condition, message) ::StoneyDSP::ignoreUnused(condition, message)
 #endif
 
 // #if defined (STONEYDSP_DEBUG)
@@ -152,6 +158,7 @@ ::StoneyDSP::StoneyVCV::Engine<T>::~Engine() noexcept
     DBG("Destroying StoneyDSP::StoneyVCV::Engine");
 }
 
+// Explicit instantiations to ensure the definition is visible to the linker...
 template struct ::StoneyDSP::StoneyVCV::Engine<double>;
 template struct ::StoneyDSP::StoneyVCV::Engine<float>;
 
@@ -167,10 +174,16 @@ template struct ::StoneyDSP::StoneyVCV::Engine<float>;
 template <class TWidget = ::rack::widget::Widget>
 inline TWidget *createWidget(::rack::math::Vec pos)
 {
+    static_assert(::std::is_base_of<::rack::widget::Widget, TWidget>::value, "TWidget must be derived from rack::widget::Widget");
+
 	TWidget *o = new TWidget;
 	o->box.pos = pos;
 	return o;
 }
+// Explicit instantiations to ensure the definition is visible to the linker...
+template ::rack::widget::Widget *::StoneyDSP::StoneyVCV::createWidget<::rack::widget::Widget>(::rack::math::Vec pos);
+
+//==============================================================================
 
 /**
  * @brief Creates a `Widget` subclass with its center at a position.
@@ -186,6 +199,10 @@ inline TWidget *createWidgetCentered(::rack::math::Vec pos)
 	o->box.pos = o->box.pos.minus(o->box.size.div(2));
 	return o;
 }
+// Explicit instantiations to ensure the definition is visible to the linker...
+template ::rack::widget::Widget *::StoneyDSP::StoneyVCV::createWidgetCentered<::rack::widget::Widget>(::rack::math::Vec pos);
+
+//==============================================================================
 
 /**
  * @brief Creates a `Widget` subclass with its top-left at a position and its
@@ -203,6 +220,10 @@ inline TWidget *createWidgetSized(::rack::math::Vec pos, ::rack::math::Vec size)
 	o->box.size = size;
 	return o;
 }
+// Explicit instantiations to ensure the definition is visible to the linker...
+template ::rack::widget::Widget *::StoneyDSP::StoneyVCV::createWidgetSized<::rack::widget::Widget>(::rack::math::Vec pos, ::rack::math::Vec size);
+
+//==============================================================================
 
 /**
  * @brief Creates a `Widget` subclass with its top-left at a position.
@@ -219,53 +240,169 @@ inline TWidget *createWidgetCenteredSized(::rack::math::Vec pos, ::rack::math::V
 	o->box.size = size;
 	return o;
 }
+// Explicit instantiations to ensure the definition is visible to the linker...
+template ::rack::widget::Widget *::StoneyDSP::StoneyVCV::createWidgetCenteredSized<::rack::widget::Widget>(::rack::math::Vec pos, ::rack::math::Vec size);
+
+//==============================================================================
+
+/**
+ * @brief
+ *
+ * @tparam
+ *
+ * @param pos
+ * @param module
+ * @param inputId
+ *
+ * @return
+ */
+template <class TParamWidget = ::rack::app::ParamWidget>
+inline TParamWidget *createParamWidget(::rack::math::Vec pos, ::rack::engine::Module* module, int paramId)
+{
+    using namespace rack;
+
+    static_assert(::std::is_base_of<::rack::app::ParamWidget, TParamWidget>::value, "TParamWidget must be derived from rack::app::ParamWidget");
+
+	TParamWidget* o = new TParamWidget;
+	o->box.pos = pos;
+	o->app::ParamWidget::module = module;
+	o->app::ParamWidget::paramId = paramId;
+	o->initParamQuantity();
+	return o;
+}
+// Explicit instantiations to ensure the definition is visible to the linker...
+template ::rack::app::ParamWidget *::StoneyDSP::StoneyVCV::createParamWidget<::rack::app::ParamWidget>(::rack::math::Vec pos, ::rack::engine::Module* module, int paramId);
+
+//==============================================================================
+
+/**
+ * @brief
+ *
+ * @tparam
+ *
+ * @param pos
+ * @param module
+ * @param inputId
+ *
+ * @return
+ */
+template <class TParamWidget = ::rack::app::ParamWidget>
+inline TParamWidget *createParamWidgetCentered(::rack::math::Vec pos, ::rack::engine::Module* module, int paramId)
+{
+	TParamWidget* o = ::StoneyDSP::StoneyVCV::createParamWidget<TParamWidget>(pos, module, paramId);
+    o->box.pos = o->box.pos.minus(o->box.size.div(2));
+	return o;
+}
+// Explicit instantiations to ensure the definition is visible to the linker...
+template ::rack::app::ParamWidget *::StoneyDSP::StoneyVCV::createParamWidgetCentered<::rack::app::ParamWidget>(::rack::math::Vec pos, ::rack::engine::Module* module, int paramId);
 
+//==============================================================================
+
+/**
+ * @brief
+ *
+ * @tparam
+ *
+ * @param pos
+ * @param module
+ * @param inputId
+ *
+ * @return
+ */
 template <class TPortWidget = ::rack::app::PortWidget>
 inline TPortWidget *createInput(::rack::math::Vec pos, ::rack::engine::Module *module, int inputId)
 {
     // Import some namespaces for convenience
     using namespace ::rack;
 
+    static_assert(::std::is_base_of<::rack::app::PortWidget, TPortWidget>::value, "TPortWidget must be derived from rack::app::PortWidget");
+
 	TPortWidget *o = new TPortWidget;
 	o->box.pos = pos;
 	o->app::PortWidget::module = module;
 	o->app::PortWidget::type = ::rack::engine::Port::INPUT;
 	o->app::PortWidget::portId = inputId;
 	return o;
 }
+// Explicit instantiations to ensure the definition is visible to the linker...
+template ::rack::app::PortWidget *::StoneyDSP::StoneyVCV::createInput<::rack::app::PortWidget>(::rack::math::Vec pos, ::rack::engine::Module *module, int inputId);
 
+//==============================================================================
 
+/**
+ * @brief
+ *
+ * @tparam
+ *
+ * @param pos
+ * @param module
+ * @param inputId
+ *
+ * @return
+ */
 template <class TPortWidget = ::rack::app::PortWidget>
 inline TPortWidget *createInputCentered(::rack::math::Vec pos, ::rack::engine::Module* module, int inputId)
 {
 	TPortWidget *o = ::StoneyDSP::StoneyVCV::createInput<TPortWidget>(pos, module, inputId);
 	o->box.pos = o->box.pos.minus(o->box.size.div(2));
 	return o;
 }
+// Explicit instantiations to ensure the definition is visible to the linker...
+template ::rack::app::PortWidget *::StoneyDSP::StoneyVCV::createInputCentered<::rack::app::PortWidget>(::rack::math::Vec pos, ::rack::engine::Module *module, int inputId);
 
+//==============================================================================
 
+/**
+ * @brief
+ *
+ * @tparam
+ *
+ * @param pos
+ * @param module
+ * @param outputId
+ *
+ * @return
+ */
 template <class TPortWidget = ::rack::app::PortWidget>
 inline TPortWidget* createOutput(::rack::math::Vec pos, ::rack::engine::Module *module, int outputId)
 {
     // Import some namespaces for convenience
     using namespace ::rack;
 
+    static_assert(::std::is_base_of<::rack::app::PortWidget, TPortWidget>::value, "TPortWidget must be derived from rack::app::PortWidget");
+
 	TPortWidget *o = new TPortWidget;
 	o->box.pos = pos;
 	o->app::PortWidget::module = module;
 	o->app::PortWidget::type = ::rack::engine::Port::OUTPUT;
 	o->app::PortWidget::portId = outputId;
 	return o;
 }
+// Explicit instantiations to ensure the definition is visible to the linker...
+template ::rack::app::PortWidget *::StoneyDSP::StoneyVCV::createOutput<::rack::app::PortWidget>(::rack::math::Vec pos, ::rack::engine::Module *module, int inputId);
 
+//==============================================================================
 
+/**
+ * @brief
+ *
+ * @tparam
+ *
+ * @param pos
+ * @param module
+ * @param outputId
+ *
+ * @return
+ */
 template <class TPortWidget = ::rack::app::PortWidget>
 inline TPortWidget *createOutputCentered(::rack::math::Vec pos, ::rack::engine::Module *module, int outputId)
 {
 	TPortWidget *o = ::StoneyDSP::StoneyVCV::createOutput<TPortWidget>(pos, module, outputId);
 	o->box.pos = o->box.pos.minus(o->box.size.div(2));
 	return o;
 }
+// Explicit instantiations to ensure the definition is visible to the linker...
+template ::rack::app::PortWidget *::StoneyDSP::StoneyVCV::createOutputCentered<::rack::app::PortWidget>(::rack::math::Vec pos, ::rack::engine::Module *module, int inputId);
 
 //==============================================================================
 
@@ -277,6 +414,9 @@ inline TPortWidget *createOutputCentered(::rack::math::Vec pos, ::rack::engine::
   /// @} group StoneyDSP
 } // namespace StoneyDSP
 
+//==============================================================================
+
+
 //==============================================================================
 
 /**