Change Muxlicer from header to source file.

src/Mex.cpp

@@ -1,130 +0,0 @@
-#include "plugin.hpp"
-#include "Muxlicer.hpp"
-
-
-struct Mex : Module {
-	static const int numSteps = 8;
-	enum ParamIds {
-		ENUMS(STEP_PARAM, numSteps),
-		NUM_PARAMS
-	};
-	enum InputIds {
-		GATE_IN_INPUT,
-		NUM_INPUTS
-	};
-	enum OutputIds {
-		OUT_OUTPUT,
-		NUM_OUTPUTS
-	};
-	enum LightIds {
-		ENUMS(LED, numSteps),
-		NUM_LIGHTS
-	};
-	enum StepState {
-		GATE_IN_MODE,
-		MUTE_MODE,
-		MUXLICER_MODE
-	};
-
-	dsp::SchmittTrigger gateInTrigger;
-
-	Mex() {
-		config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
-
-		for (int i = 0; i < 8; ++i) {
-			configSwitch(STEP_PARAM + i, 0.f, 2.f, 0.f, string::f("Step %d", i + 1), {"Gate in/Clock Out", "Muted", "All Gates"});
-		}
-	}
-
-	Muxlicer* findHostModulePtr(Module* module) {
-		if (module) {
-			if (module->leftExpander.module) {
-				// if it's Muxlicer, we're done
-				if (module->leftExpander.module->model == modelMuxlicer) {
-					return reinterpret_cast<Muxlicer*>(module->leftExpander.module);
-				}
-				// if it's Mex, keep recursing
-				else if (module->leftExpander.module->model == modelMex) {
-					return findHostModulePtr(module->leftExpander.module);
-				}
-			}
-		}
-
-		return nullptr;
-	}
-
-	void process(const ProcessArgs& args) override {
-
-		for (int i = 0; i < 8; i++) {
-			lights[i].setBrightness(0.f);
-		}
-
-		Muxlicer const* mother = findHostModulePtr(this);
-
-		if (mother) {
-
-			float gate = 0.f;
-
-			if (mother->playState != Muxlicer::STATE_STOPPED) {
-				const int currentStep = clamp(mother->addressIndex, 0, 7);
-				StepState state = (StepState) params[STEP_PARAM + currentStep].getValue();
-				if (state == MUXLICER_MODE) {
-					gate = mother->isAllGatesOutHigh;
-				}
-				else if (state == GATE_IN_MODE) {
-					// gate in will convert non-gate signals to gates (via schmitt trigger)
-					// if input is present
-					if (inputs[GATE_IN_INPUT].isConnected()) {
-						gateInTrigger.process(inputs[GATE_IN_INPUT].getVoltage());
-						gate = gateInTrigger.isHigh();
-					}
-					// otherwise the main Muxlicer output clock (including divisions/multiplications)
-					// is normalled in
-					else {
-						gate = mother->isOutputClockHigh;
-					}
-				}
-
-				lights[currentStep].setBrightness(gate);
-			}
-
-			outputs[OUT_OUTPUT].setVoltage(gate * 10.f);
-		}
-	}
-};
-
-
-struct MexWidget : ModuleWidget {
-	MexWidget(Mex* module) {
-		setModule(module);
-		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/panels/Mex.svg")));
-
-		addChild(createWidget<Knurlie>(Vec(RACK_GRID_WIDTH, 0)));
-		addChild(createWidget<Knurlie>(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
-
-		addParam(createParamCentered<BefacoSwitchHorizontal>(mm2px(Vec(8.088, 13.063)),  module, Mex::STEP_PARAM + 0));
-		addParam(createParamCentered<BefacoSwitchHorizontal>(mm2px(Vec(8.088, 25.706)),  module, Mex::STEP_PARAM + 1));
-		addParam(createParamCentered<BefacoSwitchHorizontal>(mm2px(Vec(8.088, 38.348)),  module, Mex::STEP_PARAM + 2));
-		addParam(createParamCentered<BefacoSwitchHorizontal>(mm2px(Vec(8.088, 50.990)),  module, Mex::STEP_PARAM + 3));
-		addParam(createParamCentered<BefacoSwitchHorizontal>(mm2px(Vec(8.088, 63.632)),  module, Mex::STEP_PARAM + 4));
-		addParam(createParamCentered<BefacoSwitchHorizontal>(mm2px(Vec(8.088, 76.274)),  module, Mex::STEP_PARAM + 5));
-		addParam(createParamCentered<BefacoSwitchHorizontal>(mm2px(Vec(8.088, 88.916)),  module, Mex::STEP_PARAM + 6));
-		addParam(createParamCentered<BefacoSwitchHorizontal>(mm2px(Vec(8.088, 101.559)), module, Mex::STEP_PARAM + 7));
-
-		addInput(createInputCentered<PJ301MPort>(mm2px(Vec(4.978, 113.445)), module, Mex::GATE_IN_INPUT));
-
-		addOutput(createOutputCentered<PJ301MPort>(mm2px(Vec(15.014, 113.4)), module, Mex::OUT_OUTPUT));
-
-		addChild(createLightCentered<SmallLight<RedLight>>(mm2px(Vec(17.7, 13.063)),  module, Mex::LED + 0));
-		addChild(createLightCentered<SmallLight<RedLight>>(mm2px(Vec(17.7, 25.706)),  module, Mex::LED + 1));
-		addChild(createLightCentered<SmallLight<RedLight>>(mm2px(Vec(17.7, 38.348)),  module, Mex::LED + 2));
-		addChild(createLightCentered<SmallLight<RedLight>>(mm2px(Vec(17.7, 50.990)),  module, Mex::LED + 3));
-		addChild(createLightCentered<SmallLight<RedLight>>(mm2px(Vec(17.7, 63.632)),  module, Mex::LED + 4));
-		addChild(createLightCentered<SmallLight<RedLight>>(mm2px(Vec(17.7, 76.274)),  module, Mex::LED + 5));
-		addChild(createLightCentered<SmallLight<RedLight>>(mm2px(Vec(17.7, 88.916)),  module, Mex::LED + 6));
-		addChild(createLightCentered<SmallLight<RedLight>>(mm2px(Vec(17.7, 101.558)), module, Mex::LED + 7));
-	}
-};
-
-
-Model* modelMex = createModel<Mex, MexWidget>("Mex");

src/Muxlicer.hpp → src/Muxlicer.cpp

@@ -1,11 +1,10 @@
-#pragma once
 #include "plugin.hpp"
 
 using simd::float_4;
 
 // an implementation of a performable, 3-stage switch, i.e. where
 // the state triggers after being dragged a certain distance
-struct BefacoSwitchMomentary : SVGSwitch {
+struct BefacoSwitchMomentary : SvgSwitch {
 	BefacoSwitchMomentary() {
 		momentary = true;
 		addFrame(APP->window->loadSvg(asset::system("res/ComponentLibrary/BefacoSwitch_0.svg")));
@@ -1008,3 +1007,133 @@ struct MuxlicerWidget : ModuleWidget {
 
 Model* modelMuxlicer = createModel<Muxlicer, MuxlicerWidget>("Muxlicer");
 
+
+// Mex
+
+
+struct Mex : Module {
+	static const int numSteps = 8;
+	enum ParamIds {
+		ENUMS(STEP_PARAM, numSteps),
+		NUM_PARAMS
+	};
+	enum InputIds {
+		GATE_IN_INPUT,
+		NUM_INPUTS
+	};
+	enum OutputIds {
+		OUT_OUTPUT,
+		NUM_OUTPUTS
+	};
+	enum LightIds {
+		ENUMS(LED, numSteps),
+		NUM_LIGHTS
+	};
+	enum StepState {
+		GATE_IN_MODE,
+		MUTE_MODE,
+		MUXLICER_MODE
+	};
+
+	dsp::SchmittTrigger gateInTrigger;
+
+	Mex() {
+		config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
+
+		for (int i = 0; i < 8; ++i) {
+			configSwitch(STEP_PARAM + i, 0.f, 2.f, 0.f, string::f("Step %d", i + 1), {"Gate in/Clock Out", "Muted", "All Gates"});
+		}
+	}
+
+	Muxlicer* findHostModulePtr(Module* module) {
+		if (module) {
+			if (module->leftExpander.module) {
+				// if it's Muxlicer, we're done
+				if (module->leftExpander.module->model == modelMuxlicer) {
+					return reinterpret_cast<Muxlicer*>(module->leftExpander.module);
+				}
+				// if it's Mex, keep recursing
+				else if (module->leftExpander.module->model == modelMex) {
+					return findHostModulePtr(module->leftExpander.module);
+				}
+			}
+		}
+
+		return nullptr;
+	}
+
+	void process(const ProcessArgs& args) override {
+
+		for (int i = 0; i < 8; i++) {
+			lights[i].setBrightness(0.f);
+		}
+
+		Muxlicer const* mother = findHostModulePtr(this);
+
+		if (mother) {
+
+			float gate = 0.f;
+
+			if (mother->playState != Muxlicer::STATE_STOPPED) {
+				const int currentStep = clamp(mother->addressIndex, 0, 7);
+				StepState state = (StepState) params[STEP_PARAM + currentStep].getValue();
+				if (state == MUXLICER_MODE) {
+					gate = mother->isAllGatesOutHigh;
+				}
+				else if (state == GATE_IN_MODE) {
+					// gate in will convert non-gate signals to gates (via schmitt trigger)
+					// if input is present
+					if (inputs[GATE_IN_INPUT].isConnected()) {
+						gateInTrigger.process(inputs[GATE_IN_INPUT].getVoltage());
+						gate = gateInTrigger.isHigh();
+					}
+					// otherwise the main Muxlicer output clock (including divisions/multiplications)
+					// is normalled in
+					else {
+						gate = mother->isOutputClockHigh;
+					}
+				}
+
+				lights[currentStep].setBrightness(gate);
+			}
+
+			outputs[OUT_OUTPUT].setVoltage(gate * 10.f);
+		}
+	}
+};
+
+
+struct MexWidget : ModuleWidget {
+	MexWidget(Mex* module) {
+		setModule(module);
+		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/panels/Mex.svg")));
+
+		addChild(createWidget<Knurlie>(Vec(RACK_GRID_WIDTH, 0)));
+		addChild(createWidget<Knurlie>(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
+
+		addParam(createParamCentered<BefacoSwitchHorizontal>(mm2px(Vec(8.088, 13.063)),  module, Mex::STEP_PARAM + 0));
+		addParam(createParamCentered<BefacoSwitchHorizontal>(mm2px(Vec(8.088, 25.706)),  module, Mex::STEP_PARAM + 1));
+		addParam(createParamCentered<BefacoSwitchHorizontal>(mm2px(Vec(8.088, 38.348)),  module, Mex::STEP_PARAM + 2));
+		addParam(createParamCentered<BefacoSwitchHorizontal>(mm2px(Vec(8.088, 50.990)),  module, Mex::STEP_PARAM + 3));
+		addParam(createParamCentered<BefacoSwitchHorizontal>(mm2px(Vec(8.088, 63.632)),  module, Mex::STEP_PARAM + 4));
+		addParam(createParamCentered<BefacoSwitchHorizontal>(mm2px(Vec(8.088, 76.274)),  module, Mex::STEP_PARAM + 5));
+		addParam(createParamCentered<BefacoSwitchHorizontal>(mm2px(Vec(8.088, 88.916)),  module, Mex::STEP_PARAM + 6));
+		addParam(createParamCentered<BefacoSwitchHorizontal>(mm2px(Vec(8.088, 101.559)), module, Mex::STEP_PARAM + 7));
+
+		addInput(createInputCentered<PJ301MPort>(mm2px(Vec(4.978, 113.445)), module, Mex::GATE_IN_INPUT));
+
+		addOutput(createOutputCentered<PJ301MPort>(mm2px(Vec(15.014, 113.4)), module, Mex::OUT_OUTPUT));
+
+		addChild(createLightCentered<SmallLight<RedLight>>(mm2px(Vec(17.7, 13.063)),  module, Mex::LED + 0));
+		addChild(createLightCentered<SmallLight<RedLight>>(mm2px(Vec(17.7, 25.706)),  module, Mex::LED + 1));
+		addChild(createLightCentered<SmallLight<RedLight>>(mm2px(Vec(17.7, 38.348)),  module, Mex::LED + 2));
+		addChild(createLightCentered<SmallLight<RedLight>>(mm2px(Vec(17.7, 50.990)),  module, Mex::LED + 3));
+		addChild(createLightCentered<SmallLight<RedLight>>(mm2px(Vec(17.7, 63.632)),  module, Mex::LED + 4));
+		addChild(createLightCentered<SmallLight<RedLight>>(mm2px(Vec(17.7, 76.274)),  module, Mex::LED + 5));
+		addChild(createLightCentered<SmallLight<RedLight>>(mm2px(Vec(17.7, 88.916)),  module, Mex::LED + 6));
+		addChild(createLightCentered<SmallLight<RedLight>>(mm2px(Vec(17.7, 101.558)), module, Mex::LED + 7));
+	}
+};
+
+
+Model* modelMex = createModel<Mex, MexWidget>("Mex");