wap icons, fix samples bug in SynthLab

6 files changed, 30 insertions, 28 deletions

diff --git a/TamTamSynthLab.activity/SynthLab/SynthLabMain.py b/TamTamSynthLab.activity/SynthLab/SynthLabMain.py
index a24e4f9..ace1a9d 100644
--- a/TamTamSynthLab.activity/SynthLab/SynthLabMain.py
+++ b/TamTamSynthLab.activity/SynthLab/SynthLabMain.py
@@ -368,7 +368,9 @@ class SynthLabMain(gtk.EventBox):
             if SynthLabConstants.SYNTHTYPES[self.objectType][self.choosenType] == SynthLabConstants.VCO:
                 return SynthLabConstants.VCO_WAVEFORMS[int(self.slider2Val)]
             elif SynthLabConstants.SYNTHTYPES[self.objectType][self.choosenType] == SynthLabConstants.SAMPLE or SynthLabConstants.SYNTHTYPES[self.objectType][self.choosenType] == SynthLabConstants.GRAIN:
-                return self.sample_names[int(self.slider2Val)]
+		sname = self.sample_names[int(self.slider2Val)]
+                self.csnd.load_instrument(sname)
+                return sname
             elif SynthLabConstants.SYNTHTYPES[self.objectType][self.choosenType] == SynthLabConstants.VOICE:
                 return SynthLabConstants.VOWEL_TYPES[int(self.slider2Val)]
             else:
@@ -1435,4 +1437,4 @@ class SynthLabMain(gtk.EventBox):
         f = shelve.open( Config.TAM_TAM_ROOT + '/common/Resources/SynthFiles/' + preset, 'r')
         self.loadState(f)
         f.close()
-        self.handleSaveTemp()
\ No newline at end of file
+        self.handleSaveTemp()
diff --git a/TamTamSynthLab.activity/icons/sl-trackpadX+.svg b/TamTamSynthLab.activity/icons/sl-trackpadX+.svg
index 8122fed..51bac2e 100755
--- a/TamTamSynthLab.activity/icons/sl-trackpadX+.svg
+++ b/TamTamSynthLab.activity/icons/sl-trackpadX+.svg
@@ -6,17 +6,17 @@
 <polygon fill="#FFFF33" stroke="#333333" stroke-linecap="round" stroke-miterlimit="8" points="5.5,8.569 9.615,4.812 

 	69.386,4.812 73.5,8.569 73.5,49.617 57.114,72.812 24.151,72.812 5.5,49.617 "/>

 <circle fill="#F5D04E" stroke="#333333" stroke-linecap="round" stroke-linejoin="round" cx="39.5" cy="73.125" r="5.375"/>

-<rect x="19.5" y="14.499" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="square" stroke-linejoin="round" width="40" height="40.002"/>

+<rect x="17.001" y="10.8" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" width="44.998" height="45"/>

 <g>

 	

-		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.641" y1="22.411" x2="39.641" y2="49.913"/>

+		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="24.734" y1="34.017" x2="55.7" y2="34.017"/>

 	

-		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.363" y1="21.411" x2="31.861" y2="28.91"/>

+		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="22.734" y1="34.396" x2="31.203" y2="42.831"/>

 	

-		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.363" y1="49.438" x2="31.861" y2="41.938"/>

+		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="55.859" y1="34.396" x2="47.451" y2="42.831"/>

 	

-		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.641" y1="21.16" x2="47.139" y2="28.661"/>

+		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="23.327" y1="34.017" x2="31.796" y2="25.549"/>

 	

-		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.641" y1="49.689" x2="47.139" y2="42.188"/>

+		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="56.266" y1="34.017" x2="47.857" y2="25.549"/>

 </g>

 </svg>

diff --git a/TamTamSynthLab.activity/icons/sl-trackpadX-menu.svg b/TamTamSynthLab.activity/icons/sl-trackpadX-menu.svg
index 45e555c..0d6598b 100644
--- a/TamTamSynthLab.activity/icons/sl-trackpadX-menu.svg
+++ b/TamTamSynthLab.activity/icons/sl-trackpadX-menu.svg
@@ -5,17 +5,17 @@
 	 width="80px" height="80px" viewBox="0 0 80 80" enable-background="new 0 0 80 80" xml:space="preserve">

 <polygon fill="#FFFF33" stroke="#333333" stroke-linecap="round" stroke-miterlimit="8" points="9.5,12.127 13.131,8.812 

 	65.871,8.812 69.5,12.127 69.5,48.346 55.041,68.812 25.957,68.812 9.5,48.346 "/>

-<rect x="21.853" y="17.359" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="square" stroke-linejoin="round" width="35.294" height="35.296"/>

+<rect x="22" y="19" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" width="35" height="35"/>

 <g>

 	

-		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.625" y1="24.341" x2="39.625" y2="48.607"/>

+		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="28.491" y1="36.581" x2="51.578" y2="36.581"/>

 	

-		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.379" y1="23.458" x2="32.76" y2="30.075"/>

+		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="27" y1="36.916" x2="33.314" y2="44.358"/>

 	

-		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.379" y1="48.188" x2="32.76" y2="41.569"/>

+		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="51.697" y1="36.916" x2="45.428" y2="44.358"/>

 	

-		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.625" y1="23.237" x2="46.24" y2="29.855"/>

+		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="27.442" y1="36.581" x2="33.756" y2="29.109"/>

 	

-		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.625" y1="48.41" x2="46.24" y2="41.79"/>

+		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="52" y1="36.581" x2="45.73" y2="29.109"/>

 </g>

 </svg>

diff --git a/TamTamSynthLab.activity/icons/sl-trackpadY+.svg b/TamTamSynthLab.activity/icons/sl-trackpadY+.svg
index 51bac2e..8122fed 100755
--- a/TamTamSynthLab.activity/icons/sl-trackpadY+.svg
+++ b/TamTamSynthLab.activity/icons/sl-trackpadY+.svg
@@ -6,17 +6,17 @@
 <polygon fill="#FFFF33" stroke="#333333" stroke-linecap="round" stroke-miterlimit="8" points="5.5,8.569 9.615,4.812 

 	69.386,4.812 73.5,8.569 73.5,49.617 57.114,72.812 24.151,72.812 5.5,49.617 "/>

 <circle fill="#F5D04E" stroke="#333333" stroke-linecap="round" stroke-linejoin="round" cx="39.5" cy="73.125" r="5.375"/>

-<rect x="17.001" y="10.8" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" width="44.998" height="45"/>

+<rect x="19.5" y="14.499" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="square" stroke-linejoin="round" width="40" height="40.002"/>

 <g>

 	

-		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="24.734" y1="34.017" x2="55.7" y2="34.017"/>

+		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.641" y1="22.411" x2="39.641" y2="49.913"/>

 	

-		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="22.734" y1="34.396" x2="31.203" y2="42.831"/>

+		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.363" y1="21.411" x2="31.861" y2="28.91"/>

 	

-		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="55.859" y1="34.396" x2="47.451" y2="42.831"/>

+		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.363" y1="49.438" x2="31.861" y2="41.938"/>

 	

-		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="23.327" y1="34.017" x2="31.796" y2="25.549"/>

+		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.641" y1="21.16" x2="47.139" y2="28.661"/>

 	

-		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="56.266" y1="34.017" x2="47.857" y2="25.549"/>

+		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.641" y1="49.689" x2="47.139" y2="42.188"/>

 </g>

 </svg>

diff --git a/TamTamSynthLab.activity/icons/sl-trackpadY-menu.svg b/TamTamSynthLab.activity/icons/sl-trackpadY-menu.svg
index 0d6598b..45e555c 100644
--- a/TamTamSynthLab.activity/icons/sl-trackpadY-menu.svg
+++ b/TamTamSynthLab.activity/icons/sl-trackpadY-menu.svg
@@ -5,17 +5,17 @@
 	 width="80px" height="80px" viewBox="0 0 80 80" enable-background="new 0 0 80 80" xml:space="preserve">

 <polygon fill="#FFFF33" stroke="#333333" stroke-linecap="round" stroke-miterlimit="8" points="9.5,12.127 13.131,8.812 

 	65.871,8.812 69.5,12.127 69.5,48.346 55.041,68.812 25.957,68.812 9.5,48.346 "/>

-<rect x="22" y="19" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" width="35" height="35"/>

+<rect x="21.853" y="17.359" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="square" stroke-linejoin="round" width="35.294" height="35.296"/>

 <g>

 	

-		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="28.491" y1="36.581" x2="51.578" y2="36.581"/>

+		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.625" y1="24.341" x2="39.625" y2="48.607"/>

 	

-		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="27" y1="36.916" x2="33.314" y2="44.358"/>

+		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.379" y1="23.458" x2="32.76" y2="30.075"/>

 	

-		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="51.697" y1="36.916" x2="45.428" y2="44.358"/>

+		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.379" y1="48.188" x2="32.76" y2="41.569"/>

 	

-		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="27.442" y1="36.581" x2="33.756" y2="29.109"/>

+		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.625" y1="23.237" x2="46.24" y2="29.855"/>

 	

-		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="52" y1="36.581" x2="45.73" y2="29.109"/>

+		<line fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="39.625" y1="48.41" x2="46.24" y2="41.79"/>

 </g>

 </svg>

diff --git a/common/Resources/tamtamorc.csd b/common/Resources/tamtamorc.csd
index cb8a4d2..af430ef 100644
--- a/common/Resources/tamtamorc.csd
+++ b/common/Resources/tamtamorc.csd
@@ -615,7 +615,7 @@ SynthLab input recording
 instr 5204
 
 Sname2 sprintf "/home/olpc/.sugar/default/tamtam/snds/lab%d", int(p4)-85
-fout Sname2, 2, gasynth * 0.707
+fout Sname2, 2, gasynth
 clear gasynth
 endin
 
@@ -715,7 +715,7 @@ aout = aout*kenv
 
 vincr gasynth, aout
 
-        outs    aout, aout
+        outs    aout*.707, aout*.707
 
 zacl	0, 8