SynthLab fine tunning

2 files changed, 36 insertions, 32 deletions

diff --git a/SynthLab/SynthLabConstants.py b/SynthLab/SynthLabConstants.py
index 09631a8..0f8d23c 100755
--- a/SynthLab/SynthLabConstants.py
+++ b/SynthLab/SynthLabConstants.py
@@ -38,24 +38,24 @@ class SynthLabConstants:
     FLOAT = [.01, False]
     INTEGER = [1, 1]
 
-    # s1 s2 s3 s4 s1min s1max s2min s2max s3min s3max [s1step s1digits] [s2step s2digits] [s3step s3digits]
-    TYPES = {   'lfo': [.5, 1, 0, 0, 0, 1, 0, 20, 0, 5, FLOAT, FLOAT, INTEGER],
-                'rand': [.5, 1.5, 2, 0, 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, 5000, 0, 1, 0, 2, 100, 8000, 0, 8, FLOAT, INTEGER, FLOAT],
-                'noise': [0, 3000, 4000, 1, 0, 2, 0, 8000, 0, 6000, INTEGER, FLOAT, FLOAT],
-                'sample': [1, 5, 5000, 1, 0, 2, 0, 99, 100, 8000, FLOAT, INTEGER, FLOAT],
-                'voice': [1, 3, 5, 1, 0, 2, 0, 8, 1, 10, FLOAT, INTEGER, FLOAT],
-                'grain': [1, 4, 1, 1, 0, 2, 0, 99, 0, 1, FLOAT, INTEGER, FLOAT],
-                'wguide': [100, 3000, .8, 1, 0, 200, 100, 5000, 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],
-                'ring': [500, 1, 0, 1, 0, 1000, 0, 1, 0, 5, FLOAT, FLOAT, INTEGER],
-                'reverb': [1.5, 3000, .5, 1, 0, 4, 100, 7000, 0, 1, FLOAT, FLOAT, FLOAT],
-                'harmon': [1.25, .04, .5, 1, 0, 2, 0, 1, 0, 1, FLOAT, FLOAT, FLOAT]}
+    # s1 s2 s3 s4 s1min s1max s2min s2max s3min s3max s4min s4max [s1step s1digits] [s2step s2digits] [s3step s3digits]
+    TYPES = {   'lfo': [.5, 1, 0, 0, 0, 1, 0, 20, 0, 5, 0, 1,  FLOAT, FLOAT, INTEGER],
+                'rand': [.5, 1.5, 2, 0, 0, 2, 0, 2, 0, 20, 0, 1, FLOAT, FLOAT, FLOAT],
+                'adsr': [.02, .05, .8, .1, 0, 1, 0, 1, 0, 1, 0, 1, FLOAT, FLOAT, FLOAT],
+                'fm': [1, .5, 5, 1, 0, 2, 0, 2, 0, 10, 0, 2, FLOAT, FLOAT, FLOAT],
+                'buzz': [1, 30, .85, 1, 0, 2, 0, 40, 0, 1, 0, 2, FLOAT, INTEGER, FLOAT],
+                'vco': [1, 1, .2, 1, 0, 2, 0, 2, 0, .5, 0, 2, FLOAT, INTEGER, FLOAT],
+                'pluck': [1, 5000, 0, 1, 0, 2, 100, 8000, 0, 8, 0, 2, FLOAT, INTEGER, FLOAT],
+                'noise': [0, 3000, 4000, 1, 0, 2, 0, 8000, 0, 6000, 0, 2, INTEGER, FLOAT, FLOAT],
+                'sample': [1, 5, 5000, 1, 0, 2, 0, 99, 100, 8000, 0, 2, FLOAT, INTEGER, FLOAT],
+                'voice': [1, 3, 5, 1, 0, 2, 0, 8, 1, 10, 0, 2, FLOAT, INTEGER, FLOAT],
+                'grain': [1, 4, 1, 1, 0, 2, 0, 99, 0, 1, 0, 2, FLOAT, INTEGER, FLOAT],
+                'wguide': [100, 3000, .8, 1, 0, 200, 100, 5000, 0, 1, 0, 2, FLOAT, FLOAT, FLOAT],
+                'distort': [800, .7, .7, 1, 0, 1000, 0, 1, 0, 1, 0, 2, FLOAT, FLOAT, FLOAT],
+                '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]}
 
     CONTROL_TYPES = ['lfo', 'rand', 'adsr']
     CONTROL_TYPES_SEL = ['lfosel', 'randsel', 'adsrsel']
diff --git a/SynthLab/SynthLabParametersWindow.py b/SynthLab/SynthLabParametersWindow.py
index a6a1cf7..b1d15c9 100644
--- a/SynthLab/SynthLabParametersWindow.py
+++ b/SynthLab/SynthLabParametersWindow.py
@@ -66,13 +66,15 @@ class SynthLabParametersWindow( gtk.Window ):
         slider2Max = SynthLabConstants.TYPES[selectedType][7]
         slider3Min = SynthLabConstants.TYPES[selectedType][8]
         slider3Max = SynthLabConstants.TYPES[selectedType][9]
+        slider4Min = SynthLabConstants.TYPES[selectedType][10]
+        slider4Max = SynthLabConstants.TYPES[selectedType][11]
 
-        slider1Step = SynthLabConstants.TYPES[selectedType][10][0]
-        slider1Snap = SynthLabConstants.TYPES[selectedType][10][1]
-        slider2Step = SynthLabConstants.TYPES[selectedType][11][0]
-        slider2Snap = SynthLabConstants.TYPES[selectedType][11][1]
-        slider3Step = SynthLabConstants.TYPES[selectedType][12][0]
-        slider3Snap = SynthLabConstants.TYPES[selectedType][12][1]
+        slider1Step = SynthLabConstants.TYPES[selectedType][12][0]
+        slider1Snap = SynthLabConstants.TYPES[selectedType][12][1]
+        slider2Step = SynthLabConstants.TYPES[selectedType][13][0]
+        slider2Snap = SynthLabConstants.TYPES[selectedType][13][1]
+        slider3Step = SynthLabConstants.TYPES[selectedType][14][0]
+        slider3Snap = SynthLabConstants.TYPES[selectedType][14][1]
 
         parametersTable = self.synthObjectsParameters.choiceParamsSet[self.objectType]
         tablePos = (self.instanceID % 4)*4
@@ -108,7 +110,7 @@ class SynthLabParametersWindow( gtk.Window ):
         self.slider3.set_size_request(50, 150)
         self.sliderBox.pack_start(self.slider3, True, False)
 
-        self.p4Adjust = gtk.Adjustment(slider4Init, 0, 2, .01, .01, 0)
+        self.p4Adjust = gtk.Adjustment(slider4Init, slider4Min, slider4Max, .01, .01, 0)
         self.p4Adjust.connect("value-changed", self.sendTables, 4)
         self.slider4 = ImageVScale(Config.TAM_TAM_ROOT + '/Resources/Images/sliderbutred.png', self.p4Adjust, 7)
         self.slider4.connect("button-press-event", self.showParameter, 4)
@@ -165,13 +167,15 @@ class SynthLabParametersWindow( gtk.Window ):
         slider2Max = SynthLabConstants.TYPES[selectedType][7]
         slider3Min = SynthLabConstants.TYPES[selectedType][8]
         slider3Max = SynthLabConstants.TYPES[selectedType][9]
+        slider4Min = SynthLabConstants.TYPES[selectedType][10]
+        slider4Max = SynthLabConstants.TYPES[selectedType][11]
 
-        slider1Step = SynthLabConstants.TYPES[selectedType][10][0]
-        slider1Snap = SynthLabConstants.TYPES[selectedType][10][1]
-        slider2Step = SynthLabConstants.TYPES[selectedType][11][0]
-        slider2Snap = SynthLabConstants.TYPES[selectedType][11][1]
-        slider3Step = SynthLabConstants.TYPES[selectedType][12][0]
-        slider3Snap = SynthLabConstants.TYPES[selectedType][12][1]
+        slider1Step = SynthLabConstants.TYPES[selectedType][12][0]
+        slider1Snap = SynthLabConstants.TYPES[selectedType][12][1]
+        slider2Step = SynthLabConstants.TYPES[selectedType][13][0]
+        slider2Snap = SynthLabConstants.TYPES[selectedType][13][1]
+        slider3Step = SynthLabConstants.TYPES[selectedType][14][0]
+        slider3Snap = SynthLabConstants.TYPES[selectedType][14][1]
 
         self.slider1.set_snap(slider1Snap)
         self.slider2.set_snap(slider2Snap)
@@ -180,7 +184,7 @@ class SynthLabParametersWindow( gtk.Window ):
         self.p1Adjust.set_all(slider1Init, slider1Min, slider1Max, slider1Step, slider1Step, 0)
         self.p2Adjust.set_all(slider2Init, slider2Min, slider2Max, slider2Step, slider2Step, 0)
         self.p3Adjust.set_all(slider3Init, slider3Min, slider3Max, slider3Step, slider3Step, 0)
-        self.p4Adjust.set_all(slider4Init, 0, 2, 0.01, 0.01, 0)
+        self.p4Adjust.set_all(slider4Init, slider4Min, slider4Max, 0.01, 0.01, 0)
         
         self.tooltipsUpdate()