From 9a6492a52a1f4e85df43a8269e65386f5f1cb22f Mon Sep 17 00:00:00 2001 From: Friedolino Date: Mon, 27 Sep 2021 14:27:16 +0200 Subject: [PATCH 1/2] add velocity stretch in amp env --- src/mruby-zest/example/ZynAmpEnv.qml | 5 + src/osc-bridge/schema/test.json | 364 +++++++++++++++++++++++++-- 2 files changed, 352 insertions(+), 17 deletions(-) diff --git a/src/mruby-zest/example/ZynAmpEnv.qml b/src/mruby-zest/example/ZynAmpEnv.qml index 56d473f4..eb7279b4 100644 --- a/src/mruby-zest/example/ZynAmpEnv.qml +++ b/src/mruby-zest/example/ZynAmpEnv.qml @@ -30,6 +30,11 @@ Group { type: :float } Knob { whenValue: lambda { box.cb }; extern: box.extern+"Penvstretch"} + Knob { + type: :float; + whenValue: lambda { box.cb }; + extern: box.extern+"vStretch" + } Col { ToggleButton { label: "FRCR"; whenValue: lambda { box.cb }; extern: box.extern+"Pforcedrelease"} ToggleButton { label: "lin/log"; whenValue: lambda { box.cb }; extern: box.extern+"Plinearenvelope"} diff --git a/src/osc-bridge/schema/test.json b/src/osc-bridge/schema/test.json index 76dab6a2..abe1d792 100644 --- a/src/osc-bridge/schema/test.json +++ b/src/osc-bridge/schema/test.json @@ -583,13 +583,35 @@ }, { "path" : "/part[0,15]/kit[0,15]/padpars/FreqEnvelope/Penvstretch", - "shortname": "stretch", + "shortname": "f.str", "name" : "Penvstretch", "tooltip" : "Stretch with respect to frequency", "type" : "i", "range" : [0,127], "default" : "64" + }, + { + "path" : "/part[0,15]/kit[0,15]/padpars/FreqEnvelope/vStretch", + "shortname": "v.str", + "name" : "vStretch", + "tooltip" : "Stretch with respect to velocity", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,1.0f], + "default" : "0.0f" + + }, + { + "path" : "/part[0,15]/kit[0,15]/padpars/FreqEnvelope/vStretchFunction", + "shortname": "v.sense", + "name" : "vStretchFunction", + "tooltip" : "Velocity Stretch Function Shape", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,127.0f], + "default" : "64.0f" + }, { "path" : "/part[0,15]/kit[0,15]/padpars/FreqEnvelope/Pforcedrelease", @@ -749,13 +771,35 @@ }, { "path" : "/part[0,15]/kit[0,15]/padpars/AmpEnvelope/Penvstretch", - "shortname": "stretch", + "shortname": "f.str", "name" : "Penvstretch", "tooltip" : "Stretch with respect to frequency", "type" : "i", "range" : [0,127], "default" : "64" + }, + { + "path" : "/part[0,15]/kit[0,15]/padpars/AmpEnvelope/vStretch", + "shortname": "v.str", + "name" : "vStretch", + "tooltip" : "Stretch with respect to velocity", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,1.0f], + "default" : "0.0f" + + }, + { + "path" : "/part[0,15]/kit[0,15]/padpars/AmpEnvelope/vStretchFunction", + "shortname": "v.sense", + "name" : "vStretchFunction", + "tooltip" : "Velocity Stretch Function Shape", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,127.0f], + "default" : "64.0f" + }, { "path" : "/part[0,15]/kit[0,15]/padpars/AmpEnvelope/Pforcedrelease", @@ -915,13 +959,35 @@ }, { "path" : "/part[0,15]/kit[0,15]/padpars/FilterEnvelope/Penvstretch", - "shortname": "stretch", + "shortname": "f.str", "name" : "Penvstretch", "tooltip" : "Stretch with respect to frequency", "type" : "i", "range" : [0,127], "default" : "64" + }, + { + "path" : "/part[0,15]/kit[0,15]/padpars/FilterEnvelope/vStretch", + "shortname": "v.str", + "name" : "vStretch", + "tooltip" : "Stretch with respect to velocity", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,1.0f], + "default" : "0.0f" + + }, + { + "path" : "/part[0,15]/kit[0,15]/padpars/FilterEnvelope/vStretchFunction", + "shortname": "v.sense", + "name" : "vStretchFunction", + "tooltip" : "Velocity Stretch Function Shape", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,127.0f], + "default" : "64.0f" + }, { "path" : "/part[0,15]/kit[0,15]/padpars/FilterEnvelope/Pforcedrelease", @@ -2308,7 +2374,7 @@ }, { "id" : 1, - "value" : "Rectanglar" + "value" : "Rectangular" }, { "id" : 2, @@ -2397,7 +2463,7 @@ "path" : "/part[0,15]/kit[0,15]/padpars/Php.amp.type", "shortname": "mult", "name" : "Php.amp.type", - "tooltip" : "Type of amplitude multipler", + "tooltip" : "Type of amplitude multiplier", "type" : "i", "default" : "Off" , @@ -4596,13 +4662,35 @@ }, { "path" : "/part[0,15]/kit[0,15]/adpars/VoicePar[0,7]/FreqEnvelope/Penvstretch", - "shortname": "stretch", + "shortname": "f.str", "name" : "Penvstretch", "tooltip" : "Stretch with respect to frequency", "type" : "i", "range" : [0,127], "default" : "64" + }, + { + "path" : "/part[0,15]/kit[0,15]/adpars/VoicePar[0,7]/FreqEnvelope/vStretch", + "shortname": "v.str", + "name" : "vStretch", + "tooltip" : "Stretch with respect to velocity", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,1.0f], + "default" : "0.0f" + + }, + { + "path" : "/part[0,15]/kit[0,15]/adpars/VoicePar[0,7]/FreqEnvelope/vStretchFunction", + "shortname": "v.sense", + "name" : "vStretchFunction", + "tooltip" : "Velocity Stretch Function Shape", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,127.0f], + "default" : "64.0f" + }, { "path" : "/part[0,15]/kit[0,15]/adpars/VoicePar[0,7]/FreqEnvelope/Pforcedrelease", @@ -4762,13 +4850,35 @@ }, { "path" : "/part[0,15]/kit[0,15]/adpars/VoicePar[0,7]/AmpEnvelope/Penvstretch", - "shortname": "stretch", + "shortname": "f.str", "name" : "Penvstretch", "tooltip" : "Stretch with respect to frequency", "type" : "i", "range" : [0,127], "default" : "64" + }, + { + "path" : "/part[0,15]/kit[0,15]/adpars/VoicePar[0,7]/AmpEnvelope/vStretch", + "shortname": "v.str", + "name" : "vStretch", + "tooltip" : "Stretch with respect to velocity", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,1.0f], + "default" : "0.0f" + + }, + { + "path" : "/part[0,15]/kit[0,15]/adpars/VoicePar[0,7]/AmpEnvelope/vStretchFunction", + "shortname": "v.sense", + "name" : "vStretchFunction", + "tooltip" : "Velocity Stretch Function Shape", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,127.0f], + "default" : "64.0f" + }, { "path" : "/part[0,15]/kit[0,15]/adpars/VoicePar[0,7]/AmpEnvelope/Pforcedrelease", @@ -4928,13 +5038,35 @@ }, { "path" : "/part[0,15]/kit[0,15]/adpars/VoicePar[0,7]/FilterEnvelope/Penvstretch", - "shortname": "stretch", + "shortname": "f.str", "name" : "Penvstretch", "tooltip" : "Stretch with respect to frequency", "type" : "i", "range" : [0,127], "default" : "64" + }, + { + "path" : "/part[0,15]/kit[0,15]/adpars/VoicePar[0,7]/FilterEnvelope/vStretch", + "shortname": "v.str", + "name" : "vStretch", + "tooltip" : "Stretch with respect to velocity", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,1.0f], + "default" : "0.0f" + + }, + { + "path" : "/part[0,15]/kit[0,15]/adpars/VoicePar[0,7]/FilterEnvelope/vStretchFunction", + "shortname": "v.sense", + "name" : "vStretchFunction", + "tooltip" : "Velocity Stretch Function Shape", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,127.0f], + "default" : "64.0f" + }, { "path" : "/part[0,15]/kit[0,15]/adpars/VoicePar[0,7]/FilterEnvelope/Pforcedrelease", @@ -5094,13 +5226,35 @@ }, { "path" : "/part[0,15]/kit[0,15]/adpars/VoicePar[0,7]/FMFreqEnvelope/Penvstretch", - "shortname": "stretch", + "shortname": "f.str", "name" : "Penvstretch", "tooltip" : "Stretch with respect to frequency", "type" : "i", "range" : [0,127], "default" : "64" + }, + { + "path" : "/part[0,15]/kit[0,15]/adpars/VoicePar[0,7]/FMFreqEnvelope/vStretch", + "shortname": "v.str", + "name" : "vStretch", + "tooltip" : "Stretch with respect to velocity", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,1.0f], + "default" : "0.0f" + + }, + { + "path" : "/part[0,15]/kit[0,15]/adpars/VoicePar[0,7]/FMFreqEnvelope/vStretchFunction", + "shortname": "v.sense", + "name" : "vStretchFunction", + "tooltip" : "Velocity Stretch Function Shape", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,127.0f], + "default" : "64.0f" + }, { "path" : "/part[0,15]/kit[0,15]/adpars/VoicePar[0,7]/FMFreqEnvelope/Pforcedrelease", @@ -5260,13 +5414,35 @@ }, { "path" : "/part[0,15]/kit[0,15]/adpars/VoicePar[0,7]/FMAmpEnvelope/Penvstretch", - "shortname": "stretch", + "shortname": "f.str", "name" : "Penvstretch", "tooltip" : "Stretch with respect to frequency", "type" : "i", "range" : [0,127], "default" : "64" + }, + { + "path" : "/part[0,15]/kit[0,15]/adpars/VoicePar[0,7]/FMAmpEnvelope/vStretch", + "shortname": "v.str", + "name" : "vStretch", + "tooltip" : "Stretch with respect to velocity", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,1.0f], + "default" : "0.0f" + + }, + { + "path" : "/part[0,15]/kit[0,15]/adpars/VoicePar[0,7]/FMAmpEnvelope/vStretchFunction", + "shortname": "v.sense", + "name" : "vStretchFunction", + "tooltip" : "Velocity Stretch Function Shape", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,127.0f], + "default" : "64.0f" + }, { "path" : "/part[0,15]/kit[0,15]/adpars/VoicePar[0,7]/FMAmpEnvelope/Pforcedrelease", @@ -6944,13 +7120,35 @@ }, { "path" : "/part[0,15]/kit[0,15]/adpars/GlobalPar/FreqEnvelope/Penvstretch", - "shortname": "stretch", + "shortname": "f.str", "name" : "Penvstretch", "tooltip" : "Stretch with respect to frequency", "type" : "i", "range" : [0,127], "default" : "64" + }, + { + "path" : "/part[0,15]/kit[0,15]/adpars/GlobalPar/FreqEnvelope/vStretch", + "shortname": "v.str", + "name" : "vStretch", + "tooltip" : "Stretch with respect to velocity", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,1.0f], + "default" : "0.0f" + + }, + { + "path" : "/part[0,15]/kit[0,15]/adpars/GlobalPar/FreqEnvelope/vStretchFunction", + "shortname": "v.sense", + "name" : "vStretchFunction", + "tooltip" : "Velocity Stretch Function Shape", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,127.0f], + "default" : "64.0f" + }, { "path" : "/part[0,15]/kit[0,15]/adpars/GlobalPar/FreqEnvelope/Pforcedrelease", @@ -7110,13 +7308,35 @@ }, { "path" : "/part[0,15]/kit[0,15]/adpars/GlobalPar/AmpEnvelope/Penvstretch", - "shortname": "stretch", + "shortname": "f.str", "name" : "Penvstretch", "tooltip" : "Stretch with respect to frequency", "type" : "i", "range" : [0,127], "default" : "64" + }, + { + "path" : "/part[0,15]/kit[0,15]/adpars/GlobalPar/AmpEnvelope/vStretch", + "shortname": "v.str", + "name" : "vStretch", + "tooltip" : "Stretch with respect to velocity", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,1.0f], + "default" : "0.0f" + + }, + { + "path" : "/part[0,15]/kit[0,15]/adpars/GlobalPar/AmpEnvelope/vStretchFunction", + "shortname": "v.sense", + "name" : "vStretchFunction", + "tooltip" : "Velocity Stretch Function Shape", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,127.0f], + "default" : "64.0f" + }, { "path" : "/part[0,15]/kit[0,15]/adpars/GlobalPar/AmpEnvelope/Pforcedrelease", @@ -7276,13 +7496,35 @@ }, { "path" : "/part[0,15]/kit[0,15]/adpars/GlobalPar/FilterEnvelope/Penvstretch", - "shortname": "stretch", + "shortname": "f.str", "name" : "Penvstretch", "tooltip" : "Stretch with respect to frequency", "type" : "i", "range" : [0,127], "default" : "64" + }, + { + "path" : "/part[0,15]/kit[0,15]/adpars/GlobalPar/FilterEnvelope/vStretch", + "shortname": "v.str", + "name" : "vStretch", + "tooltip" : "Stretch with respect to velocity", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,1.0f], + "default" : "0.0f" + + }, + { + "path" : "/part[0,15]/kit[0,15]/adpars/GlobalPar/FilterEnvelope/vStretchFunction", + "shortname": "v.sense", + "name" : "vStretchFunction", + "tooltip" : "Velocity Stretch Function Shape", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,127.0f], + "default" : "64.0f" + }, { "path" : "/part[0,15]/kit[0,15]/adpars/GlobalPar/FilterEnvelope/Pforcedrelease", @@ -8281,13 +8523,35 @@ }, { "path" : "/part[0,15]/kit[0,15]/subpars/AmpEnvelope/Penvstretch", - "shortname": "stretch", + "shortname": "f.str", "name" : "Penvstretch", "tooltip" : "Stretch with respect to frequency", "type" : "i", "range" : [0,127], "default" : "64" + }, + { + "path" : "/part[0,15]/kit[0,15]/subpars/AmpEnvelope/vStretch", + "shortname": "v.str", + "name" : "vStretch", + "tooltip" : "Stretch with respect to velocity", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,1.0f], + "default" : "0.0f" + + }, + { + "path" : "/part[0,15]/kit[0,15]/subpars/AmpEnvelope/vStretchFunction", + "shortname": "v.sense", + "name" : "vStretchFunction", + "tooltip" : "Velocity Stretch Function Shape", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,127.0f], + "default" : "64.0f" + }, { "path" : "/part[0,15]/kit[0,15]/subpars/AmpEnvelope/Pforcedrelease", @@ -8447,13 +8711,35 @@ }, { "path" : "/part[0,15]/kit[0,15]/subpars/FreqEnvelope/Penvstretch", - "shortname": "stretch", + "shortname": "f.str", "name" : "Penvstretch", "tooltip" : "Stretch with respect to frequency", "type" : "i", "range" : [0,127], "default" : "64" + }, + { + "path" : "/part[0,15]/kit[0,15]/subpars/FreqEnvelope/vStretch", + "shortname": "v.str", + "name" : "vStretch", + "tooltip" : "Stretch with respect to velocity", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,1.0f], + "default" : "0.0f" + + }, + { + "path" : "/part[0,15]/kit[0,15]/subpars/FreqEnvelope/vStretchFunction", + "shortname": "v.sense", + "name" : "vStretchFunction", + "tooltip" : "Velocity Stretch Function Shape", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,127.0f], + "default" : "64.0f" + }, { "path" : "/part[0,15]/kit[0,15]/subpars/FreqEnvelope/Pforcedrelease", @@ -8613,13 +8899,35 @@ }, { "path" : "/part[0,15]/kit[0,15]/subpars/BandWidthEnvelope/Penvstretch", - "shortname": "stretch", + "shortname": "f.str", "name" : "Penvstretch", "tooltip" : "Stretch with respect to frequency", "type" : "i", "range" : [0,127], "default" : "64" + }, + { + "path" : "/part[0,15]/kit[0,15]/subpars/BandWidthEnvelope/vStretch", + "shortname": "v.str", + "name" : "vStretch", + "tooltip" : "Stretch with respect to velocity", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,1.0f], + "default" : "0.0f" + + }, + { + "path" : "/part[0,15]/kit[0,15]/subpars/BandWidthEnvelope/vStretchFunction", + "shortname": "v.sense", + "name" : "vStretchFunction", + "tooltip" : "Velocity Stretch Function Shape", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,127.0f], + "default" : "64.0f" + }, { "path" : "/part[0,15]/kit[0,15]/subpars/BandWidthEnvelope/Pforcedrelease", @@ -8779,13 +9087,35 @@ }, { "path" : "/part[0,15]/kit[0,15]/subpars/GlobalFilterEnvelope/Penvstretch", - "shortname": "stretch", + "shortname": "f.str", "name" : "Penvstretch", "tooltip" : "Stretch with respect to frequency", "type" : "i", "range" : [0,127], "default" : "64" + }, + { + "path" : "/part[0,15]/kit[0,15]/subpars/GlobalFilterEnvelope/vStretch", + "shortname": "v.str", + "name" : "vStretch", + "tooltip" : "Stretch with respect to velocity", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,1.0f], + "default" : "0.0f" + + }, + { + "path" : "/part[0,15]/kit[0,15]/subpars/GlobalFilterEnvelope/vStretchFunction", + "shortname": "v.sense", + "name" : "vStretchFunction", + "tooltip" : "Velocity Stretch Function Shape", + "scale" : "linear", + "type" : "f", + "range" : [0.0f,127.0f], + "default" : "64.0f" + }, { "path" : "/part[0,15]/kit[0,15]/subpars/GlobalFilterEnvelope/Pforcedrelease", From 8cb8294a92887acaab7702b68c3d3a362cc7d66d Mon Sep 17 00:00:00 2001 From: Friedolino Date: Mon, 27 Sep 2021 14:29:32 +0200 Subject: [PATCH 2/2] add velocity stretch to filter ENV --- src/mruby-zest/example/ZynFilterEnv.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mruby-zest/example/ZynFilterEnv.qml b/src/mruby-zest/example/ZynFilterEnv.qml index c48782b1..b3fb400b 100644 --- a/src/mruby-zest/example/ZynFilterEnv.qml +++ b/src/mruby-zest/example/ZynFilterEnv.qml @@ -37,5 +37,6 @@ Group { Knob { whenValue: lambda { box.cb }; extern: box.extern+"PD_val"} Knob { whenValue: lambda { box.cb }; extern: box.extern+"PR_val"} Knob { whenValue: lambda { box.cb }; extern: box.extern+"Penvstretch"} + Knob { type: :float; whenValue: lambda { box.cb }; extern: box.extern+"vStretch"} } }