zynaddsubfx

commit 61561b9530b2a2bf67d9348bab9f29f610ea00fb
parent c68363610cf8af0b9708d5643411e91f30d9d5c9
Author: fundamental <[email protected]>
Date:   Tue, 26 Jul 2016 16:16:54 -0400

Add Missing rOptions() Metadata In Effects/Synths

Diffstat:
M
src/Effects/Alienwah.cpp
 | 
3
++-
M
src/Effects/DynamicFilter.cpp
 | 
3
++-
M
src/Effects/Phaser.cpp
 | 
3
++-
M
src/Effects/Reverb.cpp
 | 
3
++-
M
src/Params/ADnoteParameters.cpp
 | 
10
+++++++---
M
src/Params/PADnoteParameters.cpp
 | 
4
+++-

6 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/Effects/Alienwah.cpp b/src/Effects/Alienwah.cpp
@@ -31,7 +31,8 @@ rtosc::Ports Alienwah::ports = {
     //Pvolume/Ppanning are common
     rEffPar(Pfreq,     2, rShort("freq"), "Effect Frequency"),
     rEffPar(Pfreqrnd,  3, rShort("rand"), "Frequency Randomness"),
-    rEffPar(PLFOtype,  4, rShort("shape"), "LFO Shape"),
+    rEffPar(PLFOtype,  4, rShort("shape"),
+            rOptions(sine, triangle), "LFO Shape"),
     rEffParTF(PStereo, 5, rShort("stereo"), "Stereo/Mono Mode"),
     rEffPar(Pdepth,    6, rShort("depth"), "LFO Depth"),
     rEffPar(Pfeedback, 7, rShort("fb"), "Feedback"),
diff --git a/src/Effects/DynamicFilter.cpp b/src/Effects/DynamicFilter.cpp
@@ -31,7 +31,8 @@ rtosc::Ports DynamicFilter::ports = {
     //Pvolume/Ppanning are common
     rEffPar(Pfreq,      2, rShort("freq"),      "Effect Frequency"),
     rEffPar(Pfreqrnd,   3, rShort("rand"),      "Frequency Randomness"),
-    rEffPar(PLFOtype,   4, rShort("shape"),     "LFO Shape"),
+    rEffPar(PLFOtype,   4, rShort("shape"),
+          rOptions(sin, tri), "LFO Shape"),
     rEffPar(PStereo,    5, rShort("stereo"),    "Stereo/Mono Mode"),
     rEffPar(Pdepth,     6, rShort("depth"),     "LFO Depth"),
     rEffPar(Pampsns,    7, rShort("sense"),     "how the filter varies according to the input amplitude"),
diff --git a/src/Effects/Phaser.cpp b/src/Effects/Phaser.cpp
@@ -36,7 +36,8 @@ rtosc::Ports Phaser::ports = {
     //Pvolume/Ppanning are common
     rEffPar(lfo.Pfreq,       2, rShort("freq"),     ""),
     rEffPar(lfo.Prandomness, 3, rShort("rnd."),     ""),
-    rEffPar(lfo.PLFOtype,    4, rShort("type"),     ""),
+    rEffPar(lfo.PLFOtype,    4, rShort("type"),
+          rOptions(sine, tri), "lfo shape"),
     rEffParTF(lfo.Pstereo,   5, rShort("stereo"),   ""),
     rEffPar(Pdepth,          6, rShort("depth"),    ""),
     rEffPar(Pfb,             7, rShort("fb"),       ""),
diff --git a/src/Effects/Reverb.cpp b/src/Effects/Reverb.cpp
@@ -40,7 +40,8 @@ rtosc::Ports Reverb::ports = {
     rEffPar(Phpf,     8, rShort("lpf"),      "High pass filter"),
     rEffPar(Plohidamp,9, rShort("damp"),     "Dampening"),
     //Todo make this a selector
-    rEffPar(Ptype,    10,rShort("type"),     "Type"),
+    rEffPar(Ptype,    10,rShort("type"),
+            rOptions(Random, Freeverb, Bandwidth), "Type"),
     rEffPar(Proomsize,11,rShort("size"),     "Room Size"),
     rEffPar(Pbandwidth,12,rShort("bw"),      "Bandwidth"),
 };
diff --git a/src/Params/ADnoteParameters.cpp b/src/Params/ADnoteParameters.cpp
@@ -98,7 +98,9 @@ static const Ports voicePorts = {
     rParamI(PDetune,              rShort("fine"),
             rLinear(0, 16383), "Fine Detune"),
     rParamI(PCoarseDetune,        rShort("coarse"), "Coarse Detune"),
-    rParamZyn(PDetuneType,        rShort("type"),   "Magnitude of Detune"),
+    rParamZyn(PDetuneType,        rShort("type"),
+            rOptions(L35cents, L10cents, E100cents, E1200cents),
+            "Magnitude of Detune"),
     rToggle(PFreqEnvelopeEnabled, rShort("enable"), "Frequency Envelope Enable"),
     rToggle(PFreqLfoEnabled,      rShort("enable"), "Frequency LFO Enable"),
 
@@ -127,7 +129,9 @@ static const Ports voicePorts = {
     rParamZyn(PFMVelocityScaleFunction, rShort("sense"),  "Modulator Velocity Function"),
     rParamI(PFMDetune,                  rShort("fine"),   "Modulator Fine Detune"),
     rParamI(PFMCoarseDetune,            rShort("coarse"), "Modulator Coarse Detune"),
-    rParamZyn(PFMDetuneType,            rShort("type"),   "Modulator Detune Magnitude"),
+    rParamZyn(PFMDetuneType,            rShort("type"),
+            rOptions(L35cents, L10cents, E100cents, E1200cents),
+            "Modulator Detune Magnitude"),
     rToggle(PFMFixedFreq,               rShort("fixed"),  "Modulator Frequency Fixed"),
     rToggle(PFMFreqEnvelopeEnabled,  rShort("enable"), "Modulator Frequency Envelope"),
     rToggle(PFMAmpEnvelopeEnabled,   rShort("enable"), "Modulator Amplitude Envelope"),
@@ -185,7 +189,7 @@ static const Ports voicePorts = {
             //TODO do the same for the other engines
             d.reply(d.loc, "f", getdetune(detuneType, 0, obj->PFMDetune));
         }},
-    {"FMoctave::c:i", rProp(parameter) rDoc("Octave note offset for modulator"), NULL,
+    {"FMoctave::c:i", rProp(parameter) rShort("octave") rDoc("Octave note offset for modulator"), NULL,
         [](const char *msg, RtData &d)
         {
             rObject *obj = (rObject *)d.obj;
diff --git a/src/Params/PADnoteParameters.cpp b/src/Params/PADnoteParameters.cpp
@@ -64,7 +64,9 @@ static const rtosc::Ports realtime_ports =
     rParamZyn(POffsetHz,    rShort("offset"), "Voice constant offset"),
     rParamI(PDetune,        rShort("fine"),   "Fine Detune"),
     rParamI(PCoarseDetune,  rShort("coarse"), "Coarse Detune"),
-    rParamZyn(PDetuneType,  rShort("type"),   "Magnitude of Detune"),
+    rParamZyn(PDetuneType,  rShort("type"),
+            rOptions(L35cents, L10cents, E100cents, E1200cents),
+            "Magnitude of Detune"),
 
     {"sample#64:ifb", rProp(internal) rDoc("Nothing to see here"), 0,
         [](const char *m, rtosc::RtData &d)