Updates

.gitignore

@@ -1,6 +1,12 @@
+# Ignore all dotfiles except git dotfiles
+.*
+!.git*
+
+# Binaries and build targets
+*.a
+*.so
+*.dylib
+*.dll
 /build
+/dep
 /dist
-/plugin.dylib
-/plugin.dll
-/plugin.so
-.DS_Store

plugin.json

@@ -1,7 +1,11 @@
 {
   "slug": "Fundamental",
   "name": "VCV Free",
+<<<<<<< HEAD
   "version": "2.6.1-SR",
+=======
+  "version": "2.6.1",
+>>>>>>> e80c373575b337720703a41691536272b21b554c
   "license": "GPL-3.0-or-later",
   "brand": "VCV",
   "author": "VCV",
@@ -359,6 +363,8 @@
       "description": "CV processor",
       "manualUrl": "https://vcvrack.com/Free#Process",
       "tags": [
+        "Sample and hold",
+        "Slew limiter",
         "Polyphonic"
       ]
     },

src/Merge.cpp

@@ -18,7 +18,6 @@ struct Merge : Module {
 		NUM_LIGHTS
 	};
 
-	dsp::ClockDivider lightDivider;
 	int channels = -1;
 	int automaticChannels = 0;
 
@@ -28,7 +27,6 @@ struct Merge : Module {
 			configInput(MONO_INPUTS + i, string::f("Channel %d", i + 1));
 		configOutput(POLY_OUTPUT, "Polyphonic");
 
-		lightDivider.setDivision(512);
 		onReset();
 	}
 

src/Random.cpp

@@ -7,7 +7,7 @@ struct Random : Module {
 		SHAPE_PARAM,
 		OFFSET_PARAM,
 		MODE_PARAM, // removed in 2.0
-		// new in 2.0
+		// added in 2.0
 		PROB_PARAM,
 		RAND_PARAM,
 		RATE_CV_PARAM,
@@ -21,7 +21,7 @@ struct Random : Module {
 		SHAPE_INPUT,
 		TRIG_INPUT,
 		EXTERNAL_INPUT,
-		// new in 2.0
+		// added in 2.0
 		PROB_INPUT,
 		RAND_INPUT,
 		NUM_INPUTS
@@ -31,7 +31,7 @@ struct Random : Module {
 		LINEAR_OUTPUT,
 		SMOOTH_OUTPUT,
 		EXPONENTIAL_OUTPUT,
-		// new in 2.0
+		// added in 2.0
 		TRIG_OUTPUT,
 		NUM_OUTPUTS
 	};
@@ -74,6 +74,8 @@ struct Random : Module {
 
 		configSwitch(OFFSET_PARAM, 0.f, 1.f, 0.f, "Offset", {"Bipolar", "Unipolar"});
 
+		getParamQuantity(MODE_PARAM)->randomizeEnabled = false;
+
 		configInput(RATE_INPUT, "Clock rate");
 		configInput(SHAPE_INPUT, "Shape");
 		configInput(PROB_INPUT, "Trigger probability");
@@ -230,20 +232,26 @@ struct Random : Module {
 		lights[OFFSET_LIGHT].setBrightness(uni);
 	}
 
-	void paramsFromJson(json_t* rootJ) override {
-		// In <2.0, there were no attenuverters, so set them to 1.0 in case they are not overwritten.
-		params[RATE_CV_PARAM].setValue(1.f);
-		params[SHAPE_CV_PARAM].setValue(1.f);
-		params[PROB_CV_PARAM].setValue(1.f);
-		params[RAND_CV_PARAM].setValue(1.f);
-		// In <2.0, mode=0 implied relative mode, corresponding to about 20% RND.
-		params[RAND_PARAM].setValue(0.2f);
-		Module::paramsFromJson(rootJ);
-
-		// In <2.0, mode was used for absolute/relative mode. RND is a generalization so set it if mode is enabled.
-		if (params[MODE_PARAM].getValue() > 0.f) {
+	void fromJson(json_t* rootJ) override {
+		Module::fromJson(rootJ);
+
+		// Migrate from version <2.0
+		string::Version version;
+		json_t* versionJ = json_object_get(rootJ, "version");
+		if (versionJ)
+			version = json_string_value(versionJ);
+		if (version < string::Version("2")) {
+			// In <2.0, there were no attenuverters, so set them to 1.0 which achieves the old behavior.
+			params[RATE_CV_PARAM].setValue(1.f);
+			params[SHAPE_CV_PARAM].setValue(1.f);
+			params[PROB_CV_PARAM].setValue(1.f);
+			params[RAND_CV_PARAM].setValue(1.f);
+
+			int mode = params[MODE_PARAM].getValue();
+			// In <2.0, mode=0 implied relative mode, corresponding to about 20% RND.
+			// Absolute mode is 100% RND
+			params[RAND_PARAM].setValue(mode == 0 ? 0.2f : 1.f);
 			params[MODE_PARAM].setValue(0.f);
-			params[RAND_PARAM].setValue(1.f);
 		}
 	}
 };

src/Split.cpp

@@ -19,15 +19,12 @@ struct Split : Module {
 	};
 
 	int lastChannels = 0;
-	dsp::ClockDivider lightDivider;
 
 	Split() {
 		config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
 		configInput(POLY_INPUT, "Polyphonic");
 		for (int i = 0; i < 16; i++)
 			configOutput(MONO_OUTPUTS + i, string::f("Channel %d", i + 1));
-
-		lightDivider.setDivision(512);
 	}
 
 	void process(const ProcessArgs& args) override {

src/dr_wav.c

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #ifndef dr_wav_c
 #define dr_wav_c
 
@@ -7492,3 +7493,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
+=======
+#define DR_WAV_IMPLEMENTATION
+#include "dr_wav.h"
+>>>>>>> e80c373575b337720703a41691536272b21b554c