synthLab look...

1 files changed, 11 insertions, 7 deletions

diff --git a/SynthLab/SynthLabConstants.py b/SynthLab/SynthLabConstants.py
index eee7b30..e5f0546 100755
--- a/SynthLab/SynthLabConstants.py
+++ b/SynthLab/SynthLabConstants.py
@@ -11,23 +11,27 @@ class SynthLabConstants:
 
     # s1 s2 s3 s4 s1min s1max s2min s2max s3min s3max [s1step s1digits] [s2step s2digits] [s3step s3digits]
     TYPES = {   'lfo': [.5, 1, 0, 1, 0, 1, 0, 20, 0, 5, FLOAT, FLOAT, INTEGER],
-                'random': [.5, 1.5, 2, 1, 0, 2, 0, 2, 0, 20, FLOAT, FLOAT, FLOAT],
+                'rand': [.5, 1.5, 2, 1, 0, 2, 0, 2, 0, 20, FLOAT, FLOAT, FLOAT],
                 'adsr': [.02, .05, .8, .1, 0, 1, 0, 1, 0, 1, FLOAT, FLOAT, FLOAT],
                 'fm': [1, .5, 5, 1, 0, 2, 0, 2, 0, 10, FLOAT, FLOAT, FLOAT],
                 'buzz': [1, 30, .85, 1, 0, 2, 0, 40, 0, 1, FLOAT, INTEGER, FLOAT],
                 'vco': [1, 1, .2, 1, 0, 2, 0, 2, 0, .5, FLOAT, INTEGER, FLOAT],
                 'pluck': [1, 0, 0, 1, 0, 2, 0, 0, 0, 0, FLOAT, INTEGER, INTEGER],
                 'noise': [1, 0, 0, 1, 0, 2, 0, 0, 0, 0, INTEGER, INTEGER, INTEGER],
-                'samples': [1, 5, 0, 1, 0, 2, 0, 75, 0, 0, FLOAT, INTEGER, INTEGER],
+                'sample': [1, 5, 0, 1, 0, 2, 0, 75, 0, 0, FLOAT, INTEGER, INTEGER],
                 'voice': [1, 3, 0, 1, 0, 2, 0, 15, 0, 0, FLOAT, INTEGER, INTEGER],
                 'wguide': [100, 3000, .8, 1, 0, 200, 100, 5000, 0, 1, FLOAT, FLOAT, FLOAT],
-                'distortion': [800, .7, .7, 1, 0, 1000, 0, 1, 0, 1, FLOAT, FLOAT, FLOAT],
+                'distort': [800, .7, .7, 1, 0, 1000, 0, 1, 0, 1, FLOAT, FLOAT, FLOAT],
                 'filter': [1000, .6, 0, 1, 200, 5000, 0, 1, 0, 2, FLOAT, FLOAT, INTEGER],
-                'ringMod': [500, 1, 0, 1, 0, 1000, 0, 1, 0, 0, FLOAT, FLOAT, INTEGER],
+                'ring': [500, 1, 0, 1, 0, 1000, 0, 1, 0, 0, FLOAT, FLOAT, INTEGER],
                 'reverb': [.8, .8, .5, 1, 0, 1, 0, 1, 0, 1, FLOAT, FLOAT, FLOAT],
                 'harmon': [1.25, .5, 0, 1, 0, 2, 0, 1, 0, 0, FLOAT, FLOAT, INTEGER]}
 
-    CONTROL_TYPES = ['lfo', 'random', 'adsr']
-    SOURCE_TYPES = ['fm', 'buzz', 'vco', 'pluck', 'noise', 'samples', 'voice']
-    FX_TYPES = ['wguide', 'distortion','filter', 'ringMod', 'reverb', 'harmon']
+    CONTROL_TYPES = ['lfo', 'rand', 'adsr']
+    CONTROL_TYPES_SEL = ['lfosel', 'randsel', 'adsrsel']
+    SOURCE_TYPES = ['fm', 'buzz', 'vco', 'pluck', 'noise', 'sample', 'voice']
+    SOURCE_TYPES_SEL = ['fmsel', 'buzzsel', 'vcosel', 'plucksel', 'noisesel', 'samplesel', 'voicesel']
+    FX_TYPES = ['wguide', 'distort','filter', 'ring', 'reverb', 'harmon']
+    FX_TYPES_SEL = ['wguidesel', 'distortsel','filtersel', 'ringsel', 'reverbsel', 'harmonsel']
     CHOOSE_TYPE = [CONTROL_TYPES, SOURCE_TYPES, FX_TYPES]
+    CHOOSE_TYPE2 = [CONTROL_TYPES_SEL, SOURCE_TYPES_SEL, FX_TYPES_SEL]