10 files changed, 15 insertions, 18 deletions
diff --git a/Resources/Sounds/lab1 b/Resources/Sounds/lab1
index e586e59..b9cc5f2 100755
--- a/Resources/Sounds/lab1
+++ b/Resources/Sounds/lab1
diff --git a/Resources/Sounds/lab2 b/Resources/Sounds/lab2
index e586e59..b9cc5f2 100755
--- a/Resources/Sounds/lab2
+++ b/Resources/Sounds/lab2
diff --git a/Resources/Sounds/lab3 b/Resources/Sounds/lab3
index e586e59..b9cc5f2 100755
--- a/Resources/Sounds/lab3
+++ b/Resources/Sounds/lab3
diff --git a/Resources/Sounds/lab4 b/Resources/Sounds/lab4
index e586e59..b9cc5f2 100755
--- a/Resources/Sounds/lab4
+++ b/Resources/Sounds/lab4
diff --git a/Resources/Sounds/mic1 b/Resources/Sounds/mic1
index a3ea82a..3f1a79e 100755
--- a/Resources/Sounds/mic1
+++ b/Resources/Sounds/mic1
diff --git a/Resources/Sounds/mic2 b/Resources/Sounds/mic2
index a3ea82a..3f1a79e 100755
--- a/Resources/Sounds/mic2
+++ b/Resources/Sounds/mic2
diff --git a/Resources/Sounds/mic3 b/Resources/Sounds/mic3
index a3ea82a..3f1a79e 100755
--- a/Resources/Sounds/mic3
+++ b/Resources/Sounds/mic3
diff --git a/Resources/Sounds/mic4 b/Resources/Sounds/mic4
index a3ea82a..3f1a79e 100755
--- a/Resources/Sounds/mic4
+++ b/Resources/Sounds/mic4
diff --git a/Resources/univorc.csd b/Resources/univorc.csd
index 462b189..7eb6ade 100644
--- a/Resources/univorc.csd
+++ b/Resources/univorc.csd
@@ -385,35 +385,33 @@ krms    rms     ain
 ktrig   trigger     krms, 3000, 0
 
 if ktrig == 1 then
-event "i", 5202, 0 , .5, itab 
+event "i", 5202, 0 , 1, itab 
 turnoff
 endif
 
-ithresh = p3 - .5
+ithresh = p3 - 1
+
 if ktim > ithresh then
-gkduck = 1
-turnoff
+gkduck linseg .05, .8, .05, .2, 1
 endif
 
 endin
 
-
 /****************************************************************
 Audio input recording
 ****************************************************************/
 instr 5202
-
-gkduck  linseg .05, .4, .05, .1, 1
+kenv   adsr     0.005, 0.05, .9, 0.01
+gkduck  linseg .05, .8, .05, .19, 1
 ain inch 1
 
-adel    delay   ain, .01
+;adel    delay   ain, .01
 
 itable = 5000 + p4
-aindex line 0, p3, 1
-kenv   adsr     0.005, 0.05, .9, 0.01
-tabw  adel*kenv, aindex, itable, 1
+aindex phasor 1
+tabw  ain*kenv, aindex, itable, 1
 Sname sprintf "/home/olpc/.sugar/default/tamtam/mic%d", int(p4)-6
-fout Sname, 2, adel+kenv
+fout Sname, 12, ain*kenv
 endin
 
 /****************************************************************
@@ -422,11 +420,11 @@ SynthLab input recording
 instr 5204
 
 ain = gasynth*4
-itable = 5000 + p4
-aindex phasor .25
-tabw  ain, aindex, itable, 1
+;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, 2, ain
+fout Sname, 12, ain
 gasynth = 0
 endin
 
@@ -705,6 +703,5 @@ f41 0 8193 19 .5 .5 270 .5 ; SIGMOID FUNCTION
 f44 0 8192 5 1 8192 0.001 ; EXPONENTIAL FUNCTION
 
 i200 0 600000
-
 </CsScore>
 </CsoundSynthesizer>
diff --git a/TamTam.py b/TamTam.py
index 8282c9f..b29752c 100755
--- a/TamTam.py
+++ b/TamTam.py
@@ -100,7 +100,7 @@ class TamTam(Activity):
         self.set_resizable(False)
         self.connect( "key-press-event", self.tamtam.keyboardStandAlone.onKeyPress )
         self.connect( "key-release-event", self.tamtam.keyboardStandAlone.onKeyRelease )
-    
+
     def handleFocusIn(self, event, data=None):
         csnd.initialize(True)
         csnd.setMasterVolume(100)