diff options
author | Oli <olivier.belanger@umontreal.ca> | 2007-07-10 19:01:20 (GMT) |
---|---|---|
committer | Oli <olivier.belanger@umontreal.ca> | 2007-07-10 19:01:20 (GMT) |
commit | 3422810bac7dee97f2926c8be0b1e8c8fd00e27c (patch) | |
tree | 9e26cfc3401f8af8fd912780b564cd3a984b29bc | |
parent | cd89c3164115d7870e106bdc1546dd76c1a549ab (diff) |
Equalizer 4 bands
-rw-r--r-- | Resources/tooltips_en.py | 13 | ||||
-rw-r--r-- | Resources/univorc.csd | 6 | ||||
-rwxr-xr-x | SynthLab/SynthLabConstants.py | 9 |
3 files changed, 22 insertions, 6 deletions
diff --git a/Resources/tooltips_en.py b/Resources/tooltips_en.py index 11b3f7a..c946704 100644 --- a/Resources/tooltips_en.py +++ b/Resources/tooltips_en.py @@ -6,6 +6,8 @@ class Tooltips: self.Edit["2toolPointerButton"] = 'Select tool' self.Edit["2toolPencilButton"] = 'Draw tool' self.Edit["2toolBrushButton"] = 'Paint tool' + # create tune + self.Edit["2generateBtn"] = 'Generate new tune' # page self.Edit["2pageGenerateButton"] = 'Generate page' self.Edit["2pagePropertiesButton"] = 'Page properties' @@ -269,7 +271,13 @@ class Tooltips: MIX = MIX GAIN = GAIN - SYNTHTYPES = [[LFO, RANDOM, ADSR, TRACKPADX, TRACKPADY], [FM, BUZZ, VCO, PLUCK, NOISE, SAMPLE, VOICE, GRAIN, ADDSYNTH], [DELAY, DIST, FILTER, RINGMOD, REVERB, HARMON], [ADSR]] + EQ4BAND = 'Equalizer 4 bands' + FREQ1 = 'Band one gain' + FREQ2 = 'Band two gain' + 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]] SYNTHPARA = { 'lfo': [AMP, FREQ, WAVEFORM, OFFSET], 'rand': [MIN, MAX, FREQ, SEED], 'adsr': [ATTACK, DECAY, SUSTAIN, RELEASE], @@ -289,5 +297,6 @@ class Tooltips: 'filter': [FREQ, FSLOPE, FTYPE, GAIN], 'ring': [FREQ, MIX, WAVEFORM, GAIN], 'reverb': [REVERBD, REVERBF, REVERBL, GAIN], - 'harmon': [FREQ, DRYDELAY, MIX, GAIN]} + 'harmon': [FREQ, DRYDELAY, MIX, GAIN], + 'eq4band': [FREQ1, FREQ2, FREQ3, FREQ4]} diff --git a/Resources/univorc.csd b/Resources/univorc.csd index 70989dc..d53a0a3 100644 --- a/Resources/univorc.csd +++ b/Resources/univorc.csd @@ -452,6 +452,12 @@ elseif iFxType == 6 then aFx pvsynth ftps1 adry delay as, iPar2 aFx = ((aFx*kpara3)+(adry*(1-kpara3)))*kpara4 +elseif iFxType == 7 then + aeq1 butterbp as, 700, 500 + aeq2 butterbp as, 1500, 800 + aeq3 butterbp as, 3000, 1500 + aeq4 butterbp as, 5000, 2500 + aFx = (aeq1*kpara1)+(aeq2*kpara2)+(aeq3*kpara3)+(aeq4*kpara4) endif xout aFx diff --git a/SynthLab/SynthLabConstants.py b/SynthLab/SynthLabConstants.py index 816823f..22e3f4e 100755 --- a/SynthLab/SynthLabConstants.py +++ b/SynthLab/SynthLabConstants.py @@ -58,7 +58,8 @@ class SynthLabConstants: 'filter': [1000, .6, 0, 1, 200, 5000, 0, 1, 0, 2, 0, 2, FLOAT, FLOAT, INTEGER], '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]} + '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]} CONTROL_TYPES = ['lfo', 'rand', 'adsr', 'trackpadX', 'trackpadY'] CONTROL_TYPES_SEL = ['lfosel', 'randsel', 'adsrsel', 'trackpadXsel', 'trackpadYsel'] @@ -66,9 +67,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'] - FX_TYPES_SEL = ['wguidesel', 'distortsel','filtersel', 'ringsel', 'reverbsel', 'harmonsel'] - FX_TYPES_PLUS = ['wguide+', 'distort+','filter+', 'ring+', 'reverb+', 'harmon+'] + 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+'] OUTPUT_TYPE = ['adsr'] OUTPUT_TYPE_SEL = ['adsrsel'] CHOOSE_TYPE = [CONTROL_TYPES, SOURCE_TYPES, FX_TYPES, OUTPUT_TYPE] |