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

6 files changed, 23 insertions, 22 deletions

diff --git a/Resources/SynthFiles/synthFile6 b/Resources/SynthFiles/synthFile6
index 2d1aaa0..94b6fad 100644
--- a/Resources/SynthFiles/synthFile6
+++ b/Resources/SynthFiles/synthFile6
diff --git a/Resources/SynthFiles/synthFile7 b/Resources/SynthFiles/synthFile7
new file mode 100644
index 0000000..27d57ff
--- /dev/null
+++ b/Resources/SynthFiles/synthFile7
diff --git a/Resources/SynthFiles/synthFile8 b/Resources/SynthFiles/synthFile8
new file mode 100644
index 0000000..c1fa995
--- /dev/null
+++ b/Resources/SynthFiles/synthFile8
diff --git a/Resources/univorc.csd b/Resources/univorc.csd
index 7eb6ade..e44bc95 100644
--- a/Resources/univorc.csd
+++ b/Resources/univorc.csd
@@ -39,31 +39,31 @@ kp = iPar * kc1
 elseif iSomme == 5 then
 kp = iPar * kc2
 elseif iSomme == 7 then
-kp = iPar * kc1 * kc2
+kp = iPar * ((kc1 + kc2)*.5)
 elseif iSomme == 9 then
 kp = iPar * kc3
 elseif iSomme == 11 then
-kp = iPar * kc1 * kc3
+kp = iPar * ((kc1 + kc3)*.5)
 elseif iSomme == 13 then
-kp = iPar * kc2 * kc3
+kp = iPar * ((kc2 + kc3)*.5)
 elseif iSomme == 15 then
-kp = iPar * kc1 * kc2 * kc3
+kp = iPar * ((kc1 + kc2 + kc3)*.33)
 elseif iSomme == 17 then
 kp = iPar * kc4
 elseif iSomme == 19 then
-kp = iPar * kc1 * kc4
+kp = iPar * ((kc1 + kc4)*.5)
 elseif iSomme == 21 then
-kp = iPar * kc2 * kc4
+kp = iPar * ((kc2 + kc4)*.5)
 elseif iSomme == 23 then
-kp = iPar * kc1 * kc2 * kc4
+kp = iPar * ((kc1 + kc2 + kc4)*.33)
 elseif iSomme == 25 then
-kp = iPar * kc3 * kc4
+kp = iPar * ((kc3 + kc4)*.5)
 elseif iSomme == 27 then
-kp = iPar * kc1 * kc3 * kc4
+kp = iPar * ((kc1 + kc3 + kc4)*.5)
 elseif iSomme == 29 then
-kp = iPar * kc2 * kc3 * kc4
+kp = iPar * ((kc2 + kc3 + kc4)*.33)
 elseif iSomme == 31 then
-kp = iPar * kc1 * kc2 * kc3 * kc4
+kp = iPar * ((kc1 + kc2 + kc3 + kc4)*.25)
 endif
 
 if iTable == 5201 then
@@ -411,7 +411,7 @@ itable = 5000 + p4
 aindex phasor 1
 tabw  ain*kenv, aindex, itable, 1
 Sname sprintf "/home/olpc/.sugar/default/tamtam/mic%d", int(p4)-6
-fout Sname, 12, ain*kenv
+fout Sname, 2, ain*kenv
 endin
 
 /****************************************************************
@@ -419,12 +419,12 @@ SynthLab input recording
 ****************************************************************/
 instr 5204
 
-ain = gasynth*4
-;itable = 5000 + p4
-;aindex phasor .25
-;tabw  ain, aindex, itable, 1
+ain = gasynth*2
+itable = 5000 + p4
+aindex phasor .25
+tabw  ain, aindex, itable, 1
 Sname sprintf "/home/olpc/.sugar/default/tamtam/lab%d", int(p4)-85
-fout Sname, 12, ain
+fout Sname, 2, ain
 gasynth = 0
 endin
 
@@ -515,7 +515,7 @@ iFxOut4 table 15, 5206
 
 aout    =   (aSource1*iSourceOut1)+(aSource2*iSourceOut2)+(aSource3*iSourceOut3)+(aSource4*iSourceOut4)+(aFx1*iFxOut1)+(aFx2*iFxOut2)+(aFx3*iFxOut3)+(aFx4*iFxOut4)
 
-kenv adsr p5*p3, p6*p3, p7, p8*p3
+kenv adsr p3*p5+0.001, p3*p6, p7, p3*p8
 aout = aout*kenv
 
 gasynth =   aout
diff --git a/SynthLab/SynthLabParametersWindow.py b/SynthLab/SynthLabParametersWindow.py
index 00d73a4..1c26630 100644
--- a/SynthLab/SynthLabParametersWindow.py
+++ b/SynthLab/SynthLabParametersWindow.py
@@ -217,8 +217,9 @@ class SynthLabParametersWindow( gtk.Window ):
         if widget.get_active():
             self.choosenType = choosenType
             self.resize()
-	    typeText = Tooltips.SYNTHTYPES[self.objectType][self.choosenType]
+            typeText = Tooltips.SYNTHTYPES[self.objectType][self.choosenType]
             self.text.set_text(typeText)
+            self.writeTables( self.synthObjectsParameters.types, self.synthObjectsParameters.controlsParameters, self.synthObjectsParameters.sourcesParameters, self.synthObjectsParameters.fxsParameters )
 
     def recallSliderValue( self, num ):
         if num == 1: 
diff --git a/SynthLab/SynthLabWindow.py b/SynthLab/SynthLabWindow.py
index 3348196..14aedd0 100644
--- a/SynthLab/SynthLabWindow.py
+++ b/SynthLab/SynthLabWindow.py
@@ -35,7 +35,7 @@ class SynthLabWindow( gtk.Window ):
         self.straightConnections = []
         self.cablesPoints = [] 
         self.lineWidth = 3
-        self.pix = 8
+        self.pix = 10
         self.tooltips = gtk.Tooltips()
         self.add_events(gtk.gdk.KEY_PRESS_MASK)
         self.add_events(gtk.gdk.KEY_RELEASE_MASK)
@@ -392,13 +392,13 @@ class SynthLabWindow( gtk.Window ):
                     XDiff = (event.x - Xmin) / (Xmax - Xmin)
                     YDiff = (event.y - Ymin) / (Ymax - Ymin)
                     if Xmin == (point[0][0]-1) and Ymin == (point[1][0]-1) or Xmax == (point[0][0]+1) and Ymax == (point[1][0]+1):
-                        if -.11 < (XDiff - YDiff) < .11:
+                        if -.15 < (XDiff - YDiff) < .15:
                             if gate:
                                 del self.connections[self.cablesPoints.index(point)]
                                 self.connectAndDraw()
                                 gate = 0
                     else: 
-                        if .89 < (XDiff + YDiff) < 1.11:
+                        if .85 < (XDiff + YDiff) < 1.15:
                             if gate:
                                 del self.connections[self.cablesPoints.index(point)]
                                 self.connectAndDraw()