diff options
| -rw-r--r-- | Resources/tooltips_en.py | 11 | ||||
| -rw-r--r-- | Resources/univorc.csd | 6 | ||||
| -rwxr-xr-x | SynthLab/SynthLabConstants.py | 9 |
3 files changed, 20 insertions, 6 deletions
diff --git a/Resources/tooltips_en.py b/Resources/tooltips_en.py index c946704..8fe201f 100644 --- a/Resources/tooltips_en.py +++ b/Resources/tooltips_en.py @@ -277,7 +277,13 @@ class Tooltips: FREQ3 = 'Band three gain' FREQ4 = 'Band four gain' - SYNTHTYPES = [[LFO, RANDOM, ADSR, TRACKPADX, TRACKPADY], [FM, BUZZ, VCO, PLUCK, NOISE, SAMPLE, VOICE, GRAIN, ADDSYNTH], [DELAY, DIST, FILTER, RINGMOD, REVERB, HARMON, EQ4BAND], [ADSR]] + CHORUS = 'Chorus' + LFODEPTH = 'LFO Depth' + LFOFREQ = 'LFO Frequency' + DELAY = 'Delay' + FEEDBACK = FEEDBACK + + SYNTHTYPES = [[LFO, RANDOM, ADSR, TRACKPADX, TRACKPADY], [FM, BUZZ, VCO, PLUCK, NOISE, SAMPLE, VOICE, GRAIN, ADDSYNTH], [DELAY, DIST, FILTER, RINGMOD, REVERB, HARMON, EQ4BAND, CHORUS], [ADSR]] SYNTHPARA = { 'lfo': [AMP, FREQ, WAVEFORM, OFFSET], 'rand': [MIN, MAX, FREQ, SEED], 'adsr': [ATTACK, DECAY, SUSTAIN, RELEASE], @@ -298,5 +304,6 @@ class Tooltips: 'ring': [FREQ, MIX, WAVEFORM, GAIN], 'reverb': [REVERBD, REVERBF, REVERBL, GAIN], 'harmon': [FREQ, DRYDELAY, MIX, GAIN], - 'eq4band': [FREQ1, FREQ2, FREQ3, FREQ4]} + 'eq4band': [FREQ1, FREQ2, FREQ3, FREQ4], + 'chorus': [LFODEPTH, LFOFREQ, DELAY, FEEDBACK]} diff --git a/Resources/univorc.csd b/Resources/univorc.csd index 52ef5ff..b2db332 100644 --- a/Resources/univorc.csd +++ b/Resources/univorc.csd @@ -458,6 +458,12 @@ elseif iFxType == 7 then aeq3 butterbp as, 3000, 1000 aeq4 butterbp as, 5000, 2000 aFx = (aeq1*kpara1)+(aeq2*kpara2)+(aeq3*kpara3)+(aeq4*kpara4) +elseif iFxType == 8 then + afeed init 0 + adel oscil kpara1, kpara2, 1 + adel = adel + kpara1 + kpara3 + aFx vdelay as+afeed, adel, 50 + afeed = aFx * kpara4 endif xout aFx diff --git a/SynthLab/SynthLabConstants.py b/SynthLab/SynthLabConstants.py index 22e3f4e..07562b6 100755 --- a/SynthLab/SynthLabConstants.py +++ b/SynthLab/SynthLabConstants.py @@ -59,7 +59,8 @@ class SynthLabConstants: 'ring': [500, 1, 0, 1, 0, 1000, 0, 1, 0, 5, 0, 2, FLOAT, FLOAT, INTEGER], 'reverb': [1.5, 3000, .5, 1, 0, 4, 100, 7000, 0, 1, 0, 2, FLOAT, FLOAT, FLOAT], 'harmon': [1.25, .04, .5, 1, 0, 2, 0, 1, 0, 1, 0, 2, FLOAT, FLOAT, FLOAT], - 'eq4band': [1., 1., 1., 1., 0, 2, 0, 2, 0, 2, 0, 2, FLOAT, FLOAT, FLOAT]} + 'eq4band': [1., 1., 1., 1., 0, 2, 0, 2, 0, 2, 0, 2, FLOAT, FLOAT, FLOAT], + 'chorus': [.5, 1., 5., .5, 0, 3, 0, 10, 0, 30, 0, 1, FLOAT, FLOAT, FLOAT]} CONTROL_TYPES = ['lfo', 'rand', 'adsr', 'trackpadX', 'trackpadY'] CONTROL_TYPES_SEL = ['lfosel', 'randsel', 'adsrsel', 'trackpadXsel', 'trackpadYsel'] @@ -67,9 +68,9 @@ class SynthLabConstants: SOURCE_TYPES = ['fm', 'buzz', 'vco', 'pluck', 'noise', 'sample', 'voice', 'grain', 'addSynth'] SOURCE_TYPES_SEL = ['fmsel', 'buzzsel', 'vcosel', 'plucksel', 'noisesel', 'samplesel', 'voicesel', 'grainsel', 'addSynthsel'] SOURCE_TYPES_PLUS = ['fm+', 'buzz+', 'vco+', 'pluck+', 'noise+', 'sample+', 'voice+', 'grain+', 'addSynth+'] - FX_TYPES = ['wguide', 'distort','filter', 'ring', 'reverb', 'harmon', 'eq4band'] - FX_TYPES_SEL = ['wguidesel', 'distortsel','filtersel', 'ringsel', 'reverbsel', 'harmonsel', 'eq4bandsel'] - FX_TYPES_PLUS = ['wguide+', 'distort+','filter+', 'ring+', 'reverb+', 'harmon+', 'eq4band+'] + FX_TYPES = ['wguide', 'distort','filter', 'ring', 'reverb', 'harmon', 'eq4band', 'chorus'] + FX_TYPES_SEL = ['wguidesel', 'distortsel','filtersel', 'ringsel', 'reverbsel', 'harmonsel', 'eq4bandsel', 'chorussel'] + FX_TYPES_PLUS = ['wguide+', 'distort+','filter+', 'ring+', 'reverb+', 'harmon+', 'eq4band+', 'chorus+'] OUTPUT_TYPE = ['adsr'] OUTPUT_TYPE_SEL = ['adsrsel'] CHOOSE_TYPE = [CONTROL_TYPES, SOURCE_TYPES, FX_TYPES, OUTPUT_TYPE] |