VCVRack
/
Fundamental
mirror of https://github.com/VCVRack/Fundamental.git
1
0
Fork 0
Code Issues 0 Releases 28 Wiki Activity
Browse Source

Use Rack's new configSwitch() method.

tags/v2.0.1
Andrew Belt 5 years ago
parent
bfed46040f
commit
88133c75ce
5 changed files with 13 additions and 26 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +4
    -8
      src/LFO.cpp
  2. +2
    -4
      src/Random.cpp
  3. +2
    -4
      src/Unity.cpp
  4. +1
    -2
      src/VCA.cpp
  5. +4
    -8
      src/VCO.cpp

+ 4
- 8
src/LFO.cpp View File

@@ -117,10 +117,8 @@ struct LFO : Module {


LFO() { LFO() {
config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS); config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
SwitchQuantity* offsetQ = configParam<SwitchQuantity>(OFFSET_PARAM, 0.f, 1.f, 1.f, "Offset");
offsetQ->setLabels({"Bipolar", "Unipolar"});
SwitchQuantity* invertQ = configParam<SwitchQuantity>(INVERT_PARAM, 0.f, 1.f, 1.f, "Orientation");
invertQ->setLabels({"Inverted", "Normal"});
configSwitch(OFFSET_PARAM, 0.f, 1.f, 1.f, "Offset", {"Bipolar", "Unipolar"});
configSwitch(INVERT_PARAM, 0.f, 1.f, 1.f, "Orientation", {"Inverted", "Normal"});
configParam(FREQ_PARAM, -8.f, 10.f, 1.f, "Frequency", " Hz", 2, 1); configParam(FREQ_PARAM, -8.f, 10.f, 1.f, "Frequency", " Hz", 2, 1);
configParam(FM1_PARAM, 0.f, 1.f, 0.f, "Frequency modulation 1", "%", 0.f, 100.f); configParam(FM1_PARAM, 0.f, 1.f, 0.f, "Frequency modulation 1", "%", 0.f, 100.f);
configParam(PW_PARAM, 0.01f, 0.99f, 0.5f, "Pulse width", "%", 0.f, 100.f); configParam(PW_PARAM, 0.01f, 0.99f, 0.5f, "Pulse width", "%", 0.f, 100.f);
@@ -267,10 +265,8 @@ struct LFO2 : Module {


LFO2() { LFO2() {
config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS); config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
SwitchQuantity* offsetQ = configParam<SwitchQuantity>(OFFSET_PARAM, 0.f, 1.f, 1.f, "Offset");
offsetQ->setLabels({"Bipolar", "Unipolar"});
SwitchQuantity* invertQ = configParam<SwitchQuantity>(INVERT_PARAM, 0.f, 1.f, 1.f, "Orientation");
invertQ->setLabels({"Inverted", "Normal"});
configSwitch(OFFSET_PARAM, 0.f, 1.f, 1.f, "Offset", {"Bipolar", "Unipolar"});
configSwitch(INVERT_PARAM, 0.f, 1.f, 1.f, "Orientation", {"Inverted", "Normal"});
configParam(FREQ_PARAM, -8.f, 10.f, 1.f, "Frequency", " Hz", 2, 1); configParam(FREQ_PARAM, -8.f, 10.f, 1.f, "Frequency", " Hz", 2, 1);
configParam(WAVE_PARAM, 0.f, 3.f, 1.5f, "Wave"); configParam(WAVE_PARAM, 0.f, 3.f, 1.5f, "Wave");
configParam(FM_PARAM, 0.f, 1.f, 1.f, "Frequency modulation", "%", 0.f, 100.f); configParam(FM_PARAM, 0.f, 1.f, 1.f, "Frequency modulation", "%", 0.f, 100.f);


+ 2
- 4
src/Random.cpp View File

@@ -40,10 +40,8 @@ struct Random : Module {
config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS); config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
configParam(RATE_PARAM, std::log2(0.002f), std::log2(2000.f), std::log2(2.f), "Rate", " Hz", 2); configParam(RATE_PARAM, std::log2(0.002f), std::log2(2000.f), std::log2(2.f), "Rate", " Hz", 2);
configParam(SHAPE_PARAM, 0.f, 1.f, 0.5f, "Shape", "%", 0, 100); configParam(SHAPE_PARAM, 0.f, 1.f, 0.5f, "Shape", "%", 0, 100);
SwitchQuantity* offsetQ = configParam<SwitchQuantity>(OFFSET_PARAM, 0.f, 1.f, 1.f, "Offset");
offsetQ->setLabels({"Bipolar", "Unipolar"});
SwitchQuantity* modeQ = configParam<SwitchQuantity>(MODE_PARAM, 0.f, 1.f, 1.f, "Randomness mode");
modeQ->setLabels({"Relative", "Absolute"});
configSwitch(OFFSET_PARAM, 0.f, 1.f, 1.f, "Offset", {"Bipolar", "Unipolar"});
configSwitch(MODE_PARAM, 0.f, 1.f, 1.f, "Randomness mode", {"Relative", "Absolute"});
configInput(RATE_INPUT, "Rate"); configInput(RATE_INPUT, "Rate");
configInput(SHAPE_INPUT, "Shape"); configInput(SHAPE_INPUT, "Shape");
configInput(TRIGGER_INPUT, "Trigger"); configInput(TRIGGER_INPUT, "Trigger");


+ 2
- 4
src/Unity.cpp View File

@@ -29,10 +29,8 @@ struct Unity : Module {


Unity() { Unity() {
config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS); config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
SwitchQuantity* avg1Q = configParam<SwitchQuantity>(AVG1_PARAM, 0.0, 1.0, 0.0, "Ch 1 mode");
avg1Q->setLabels({"Sum", "Average"});
SwitchQuantity* avg2Q = configParam<SwitchQuantity>(AVG2_PARAM, 0.0, 1.0, 0.0, "Ch 2 mode");
avg2Q->setLabels({"Sum", "Average"});
configSwitch(AVG1_PARAM, 0.0, 1.0, 0.0, "Ch 1 mode", {"Sum", "Average"});
configSwitch(AVG2_PARAM, 0.0, 1.0, 0.0, "Ch 2 mode", {"Sum", "Average"});
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
for (int j = 0; j < 6; j++) { for (int j = 0; j < 6; j++) {
configInput(IN_INPUTS + i * 6 + j, string::f("In %d ch %d", i + 1, j + 1)); configInput(IN_INPUTS + i * 6 + j, string::f("In %d ch %d", i + 1, j + 1));


+ 1
- 2
src/VCA.cpp View File

@@ -158,8 +158,7 @@ struct VCA_1 : Module {
VCA_1() { VCA_1() {
config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS); config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
configParam(LEVEL_PARAM, 0.0, 1.0, 1.0, "Level", "%", 0, 100); configParam(LEVEL_PARAM, 0.0, 1.0, 1.0, "Level", "%", 0, 100);
SwitchQuantity* expQ = configParam<SwitchQuantity>(EXP_PARAM, 0.0, 1.0, 1.0, "Response mode");
expQ->setLabels({"Exponential", "Linear"});
configSwitch(EXP_PARAM, 0.0, 1.0, 1.0, "Response mode", {"Exponential", "Linear"});


} }




+ 4
- 8
src/VCO.cpp View File

@@ -280,10 +280,8 @@ struct VCO : Module {


VCO() { VCO() {
config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS); config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
SwitchQuantity* modeQ = configParam<SwitchQuantity>(MODE_PARAM, 0.f, 1.f, 1.f, "Engine mode");
modeQ->setLabels({"Digital", "Analog"});
SwitchQuantity* syncQ = configParam<SwitchQuantity>(SYNC_PARAM, 0.f, 1.f, 1.f, "Sync mode");
syncQ->setLabels({"Soft", "Hard"});
configSwitch(MODE_PARAM, 0.f, 1.f, 1.f, "Engine mode", {"Digital", "Analog"});
configSwitch(SYNC_PARAM, 0.f, 1.f, 1.f, "Sync mode", {"Soft", "Hard"});
configParam(FREQ_PARAM, -54.f, 54.f, 0.f, "Frequency", " Hz", dsp::FREQ_SEMITONE, dsp::FREQ_C4); configParam(FREQ_PARAM, -54.f, 54.f, 0.f, "Frequency", " Hz", dsp::FREQ_SEMITONE, dsp::FREQ_C4);
configParam(FINE_PARAM, -1.f, 1.f, 0.f, "Fine frequency"); configParam(FINE_PARAM, -1.f, 1.f, 0.f, "Fine frequency");
configParam(FM_PARAM, 0.f, 1.f, 0.f, "Frequency modulation", "%", 0.f, 100.f); configParam(FM_PARAM, 0.f, 1.f, 0.f, "Frequency modulation", "%", 0.f, 100.f);
@@ -425,10 +423,8 @@ struct VCO2 : Module {


VCO2() { VCO2() {
config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS); config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
SwitchQuantity* modeQ = configParam<SwitchQuantity>(MODE_PARAM, 0.f, 1.f, 1.f, "Engine mode");
modeQ->setLabels({"Digital", "Analog"});
SwitchQuantity* syncQ = configParam<SwitchQuantity>(SYNC_PARAM, 0.f, 1.f, 1.f, "Sync mode");
syncQ->setLabels({"Soft", "Hard"});
configSwitch(MODE_PARAM, 0.f, 1.f, 1.f, "Engine mode", {"Digital", "Analog"});
configSwitch(SYNC_PARAM, 0.f, 1.f, 1.f, "Sync mode", {"Soft", "Hard"});
configParam(FREQ_PARAM, -54.f, 54.f, 0.f, "Frequency", " Hz", dsp::FREQ_SEMITONE, dsp::FREQ_C4); configParam(FREQ_PARAM, -54.f, 54.f, 0.f, "Frequency", " Hz", dsp::FREQ_SEMITONE, dsp::FREQ_C4);
configParam(WAVE_PARAM, 0.f, 3.f, 1.5f, "Wave"); configParam(WAVE_PARAM, 0.f, 3.f, 1.5f, "Wave");
configParam(FM_PARAM, 0.f, 1.f, 1.f, "Frequency modulation", "%", 0.f, 100.f); configParam(FM_PARAM, 0.f, 1.f, 1.f, "Frequency modulation", "%", 0.f, 100.f);


Write Preview
Loading…
Cancel
Save