synthlab new source: granulation

3 files changed, 14 insertions, 14 deletions

diff --git a/SynthLab/SynthLabConstants.py b/SynthLab/SynthLabConstants.py
index ad56d9d..09631a8 100755
--- a/SynthLab/SynthLabConstants.py
+++ b/SynthLab/SynthLabConstants.py
@@ -47,8 +47,9 @@ class SynthLabConstants:
                 '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, 85, 100, 8000, FLOAT, INTEGER, 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],
@@ -59,9 +60,9 @@ class SynthLabConstants:
     CONTROL_TYPES = ['lfo', 'rand', 'adsr']
     CONTROL_TYPES_SEL = ['lfosel', 'randsel', 'adsrsel']
     CONTROL_TYPES_PLUS = ['lfo+', 'rand+', 'adsr+']
-    SOURCE_TYPES = ['fm', 'buzz', 'vco', 'pluck', 'noise', 'sample', 'voice']
-    SOURCE_TYPES_SEL = ['fmsel', 'buzzsel', 'vcosel', 'plucksel', 'noisesel', 'samplesel', 'voicesel']
-    SOURCE_TYPES_PLUS = ['fm+', 'buzz+', 'vco+', 'pluck+', 'noise+', 'sample+', 'voice+']
+    SOURCE_TYPES = ['fm', 'buzz', 'vco', 'pluck', 'noise', 'sample', 'voice', 'grain']
+    SOURCE_TYPES_SEL = ['fmsel', 'buzzsel', 'vcosel', 'plucksel', 'noisesel', 'samplesel', 'voicesel', 'grainsel']
+    SOURCE_TYPES_PLUS = ['fm+', 'buzz+', 'vco+', 'pluck+', 'noise+', 'sample+', 'voice+', 'grain+']
     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+']
diff --git a/SynthLab/SynthLabParametersWindow.py b/SynthLab/SynthLabParametersWindow.py
index 1e4f385..0b1382b 100644
--- a/SynthLab/SynthLabParametersWindow.py
+++ b/SynthLab/SynthLabParametersWindow.py
@@ -232,7 +232,7 @@ class SynthLabParametersWindow( gtk.Window ):
         if num == 2: 
             if Tooltips.SYNTHTYPES[self.objectType][self.choosenType] == Tooltips.VCO:
                 return Tooltips.VCO_WAVEFORMS[int(self.slider2Val)]
-            elif Tooltips.SYNTHTYPES[self.objectType][self.choosenType] == Tooltips.SAMPLE: 
+            elif Tooltips.SYNTHTYPES[self.objectType][self.choosenType] == Tooltips.SAMPLE or Tooltips.SYNTHTYPES[self.objectType][self.choosenType] == Tooltips.GRAIN: 
                 return self.sample_names[int(self.slider2Val)]
             elif Tooltips.SYNTHTYPES[self.objectType][self.choosenType] == Tooltips.VOICE:
                 return Tooltips.VOWEL_TYPES[int(self.slider2Val)]
diff --git a/SynthLab/SynthLabWindow.py b/SynthLab/SynthLabWindow.py
index c6734f4..e49ef51 100644
--- a/SynthLab/SynthLabWindow.py
+++ b/SynthLab/SynthLabWindow.py
@@ -790,20 +790,20 @@ class SynthLabWindow( gtk.Window ):
         time.sleep(.01)
         if lastTable[4] == 8:
             snd = Config.SOUNDS_DIR + '/' + self.sample_names[int(sourceParametersTable[1])]
-            mess = "perf.InputMessage('f5501 0 32768 -1 " + "\"%s\" 0 0 0')\n" % snd
-            self.csnd.sendText( mess )
+            mess = "f5501 0 32768 -1 " + "\"%s\" 0 0 0" % snd
+            self.csnd.inputMessage( mess )
         if lastTable[5] == 8:
             snd = Config.SOUNDS_DIR + '/' + self.sample_names[int(sourceParametersTable[5])]
-            mess = "perf.InputMessage('f5502 0 32768 -1 " + "\"%s\" 0 0 0')\n" % snd
-            self.csnd.sendText( mess )
+            mess = "f5502 0 32768 -1 " + "\"%s\" 0 0 0" % snd
+            self.csnd.inputMessage( mess )
         if lastTable[6] == 8:
             snd = Config.SOUNDS_DIR + '/' + self.sample_names[int(sourceParametersTable[9])]
-            mess = "perf.InputMessage('f5503 0 32768 -1 " + "\"%s\" 0 0 0')\n" % snd
-            self.csnd.sendText( mess )
+            mess = "f5503 0 32768 -1 " + "\"%s\" 0 0 0" % snd
+            self.csnd.inputMessage( mess )
         if lastTable[7] == 8:
             snd = Config.SOUNDS_DIR + '/' + self.sample_names[int(sourceParametersTable[13])]
-            mess = "perf.InputMessage('f5504 0 32768 -1 " + "\"%s\" 0 0 0')\n" % snd
-            self.csnd.sendText( mess )
+            mess = "f5504 0 32768 -1 " + "\"%s\" 0 0 0" % snd
+            self.csnd.inputMessage( mess )
         time.sleep(.01)
         self.loadPixmaps(typesTable)
         self.invalidate_rect( 0, 0, self.drawingAreaWidth, self.drawingAreaHeight )
@@ -851,7 +851,6 @@ class SynthLabWindow( gtk.Window ):
             if i[0][0] < 4 and 7 < i[1][0] < 12:
                 offset = i[1][2]
                 self.contFxConnections.append([i[0][0], i[1][0], offset])
-            print self.contFxConnections
         table = [0 for i in range(16)]
         fxs = [fx for fx in range(8,12) if fx in self.outputs]
         for fx in fxs: