Merge branch 'master' of git+ssh://jaberg@dev.laptop.org/git/projects/tamtam

1 files changed, 13 insertions, 5 deletions

diff --git a/Config.py b/Config.py
index bf05fa1..70767f7 100644
--- a/Config.py
+++ b/Config.py
@@ -475,10 +475,11 @@ class Tooltips:
         RESET = 'Reset'
         
         #Controls
-        LFO = 'Low frequency oscillator'
+        LFO = 'LFO'
         AMP = 'Amplitude'
         FREQ = 'Frequency'
         WAVEFORM = 'Waveform'
+        LFO_WAVEFORMS = ['Sine', 'Triangle', 'Bi-Square', 'Uni-Square', 'Sawtooth', 'Sawtooth-down']
         OFFSET = 'Offset'
         
         RANDOM = 'Random'
@@ -487,7 +488,7 @@ class Tooltips:
         FREQ = FREQ
         SEED = 'Seed'
         
-        ADSR = 'ADSR Envelope'
+        ADSR = 'Envelope'
         ATTACK = 'Attack'
         DECAY = 'Decay'
         SUSTAIN = 'Sustain'
@@ -509,6 +510,7 @@ class Tooltips:
         VCO = 'Voltage Controlled Oscillator'
         FREQ = FREQ
         WAVEFORM = WAVEFORM
+        VCO_WAVEFORMS = ['Sawtooth', 'Square', 'Triangle']
         FSLOPE = FSLOPE
         GAIN = GAIN
         
@@ -519,7 +521,8 @@ class Tooltips:
         GAIN = GAIN
         
         NOISE = 'Noise'
-        NOISETYPE = 'Type: White | Pink | Gaussian'
+        NOISETYPE = 'Type'
+        NOISE_TYPES = ['White', 'Pink', 'Gauss']
         FREQ = FREQ
         BANDWITH = 'Bandwith'
         GAIN = GAIN
@@ -527,12 +530,14 @@ class Tooltips:
         SAMPLE = 'Sound Sample'
         FREQ = FREQ
         SAMPLEN = 'Sample Number'
+        SAMPLE_NAMES = [name for i in range(len(INSTRUMENTS)) for name in INSTRUMENTS.keys() if INSTRUMENTS[ name ].instrumentId == i]
         LFILTER = LFILTER
         GAIN = GAIN
         
         VOICE = 'Voice'
         FREQ = FREQ
         VOWEL = 'Vowel'
+        VOWEL_TYPES = ['i', 'e', 'ee', 'a', 'u', 'o1', 'o2', 'oa', 'oe']
         VIBRATO = VIBRATO
         GAIN = GAIN
         
@@ -552,13 +557,15 @@ class Tooltips:
         FILTER = 'Filter'
         FREQ = FREQ
         FSLOPE = FSLOPE
-        FTYPE = 'Filter type: Low Pass | High Pass | Band Pass'
+        FTYPE = 'Type'
+        FILTER_TYPES = ['Lowpass', 'Highpass', 'Bandpass']
         GAIN = GAIN
         
         RINGMOD = 'Ring Modulator'
         FREQ = FREQ
         AMP = 'Amplitude'
         WAVEFORM = WAVEFORM
+        LFO_WAVEFORMS = LFO_WAVEFORMS
         GAIN = GAIN
         
         REVERB = 'Reverb'
@@ -572,7 +579,8 @@ class Tooltips:
         DRYDELAY = 'Dry delay'
         MIX = 'Mix'
         GAIN = GAIN
-        SYNTHTYPE = {	} 
+
+        SYNTHTYPES = [[LFO, RANDOM, ADSR], [FM, BUZZ, VCO, PLUCK, NOISE, SAMPLE, VOICE], [DELAY, DIST, FILTER, RINGMOD, REVERB, HARMON], [ADSR]]
         SYNTHPARA = {	'lfo': [AMP, FREQ, WAVEFORM, OFFSET],
 			            'rand': [MIN, MAX, FREQ, SEED],
 			            'adsr': [ATTACK, DECAY, SUSTAIN, RELEASE],