On the way to respect security policy

3 files changed, 34 insertions, 16 deletions

diff --git a/common/Resources/crop.csd b/common/Resources/crop.csd
index 03b10a5..483e578 100644
--- a/common/Resources/crop.csd
+++ b/common/Resources/crop.csd
@@ -14,8 +14,9 @@ nchnls=1
 Playing temp file
 ****************************************************************/
 instr 1
-
-asig diskin "/home/olpc/.sugar/default/tamtam/snds/tempMic.wav", 1
+Spath strget 999
+Stempfile strcat Spath, "/tempMic.wav"
+asig diskin Stempfile, 1
 gasig dcblock asig
 
 endin
@@ -45,9 +46,12 @@ kenv   adsr     0.01, 0.05, .9, 0.01
 
 adel    delay   gasig, .005
 
-ihandle fiopen "/home/olpc/.sugar/default/tamtam/snds/micTemp", 2
+Spath strget 999
+Sfile strcat Spath, "/micTemp.wav"
+
+ihandle fiopen Sfile, 2
 
-fout "/home/olpc/.sugar/default/tamtam/snds/micTemp", 2, adel*kenv
+fout Sfile, 2, adel*kenv
 
 ;out adel*kenv
 adel = 0
@@ -57,7 +61,9 @@ endin
 Audio input recording ( closing file )
 ****************************************************************/
 instr 4
-ficlose "/home/olpc/.sugar/default/tamtam/snds/micTemp"
+Spath strget 999
+Sfile strcat Spath, "/micTemp.wav"
+ficlose Sfile
 endin
 
 
diff --git a/common/Resources/cropSynthLab.csd b/common/Resources/cropSynthLab.csd
index cd1e25f..4abf203 100644
--- a/common/Resources/cropSynthLab.csd
+++ b/common/Resources/cropSynthLab.csd
@@ -15,9 +15,11 @@ Playing temp file
 ****************************************************************/
 instr 1
 
-gilen filelen "/home/olpc/.sugar/default/tamtam/snds/tempMic.wav"
+Spath strget 999
+Stempfile strcat Spath, "/tempMic.wav"
+gilen filelen Stempfile
 p3 = gilen
-asig diskin "/home/olpc/.sugar/default/tamtam/snds/tempMic.wav", 1
+asig diskin Stempfile, 1
 gasig dcblock asig
 
 endin
@@ -43,9 +45,12 @@ kenv   adsr     0.01, 0.05, .9, 0.01
 
 adel    delay   gasig, .005
 
-ihandle fiopen "/home/olpc/.sugar/default/tamtam/snds/micTemp", 2
+Spath strget 999
+Sfile strcat Spath, "/micTemp.wav"
 
-fout "/home/olpc/.sugar/default/tamtam/snds/micTemp", 2, adel*kenv
+ihandle fiopen Sfile, 2
+
+fout Sfile, 2, adel*kenv
 
 ;out adel*kenv
 adel = 0
@@ -55,7 +60,9 @@ endin
 Audio input recording ( closing file )
 ****************************************************************/
 instr 4
-ficlose "/home/olpc/.sugar/default/tamtam/snds/micTemp"
+Spath strget 999
+Sfile strcat Spath, "/micTemp.wav"
+ficlose Sfile
 endin
 
 
diff --git a/common/Resources/tamtamorc.csd b/common/Resources/tamtamorc.csd
index af430ef..1563a9f 100644
--- a/common/Resources/tamtamorc.csd
+++ b/common/Resources/tamtamorc.csd
@@ -15,6 +15,7 @@ gaoutR init 0
 gasynth init 0
 gkTrackpadX init 0
 gkTrackpadY init 0
+gSpath strcpy " "
 
 /*****************************
 matrix for TamTam's SynthLab
@@ -394,9 +395,10 @@ elseif iSourceType == 9 then
     aSource	homeSine p4*kpara1, kpara2*0.1, iPar3+30
     aSource = aSource*kpara4
 elseif iSourceType == 10 then
-    Sname       sprintf "/home/olpc/.sugar/default/tamtam/snds/labmic%d", iPar2
+    Sname       sprintf "/labmic%d", iPar2
+    Sfullname   strcat gSpath, Sname
     iSndpitch   = p4/261.626
-    aSource	    diskin	Sname, iSndpitch*abs(kpara3), 0, 1
+    aSource	    diskin	Sfullname, iSndpitch*abs(kpara3), 0, 1
     aSource     = aSource * kpara4
 endif
 
@@ -533,7 +535,7 @@ endin
 Performance recording start
 *****************************************************************/
 instr 5400
-Sname strcpy "/home/olpc/.sugar/default/tamtam/perf.wav"
+Sname strget p4
 ihandle fiopen Sname, 2
 fout Sname, 2, gaRecL, gaRecR
 clear gaRecL, gaRecR
@@ -543,7 +545,7 @@ endin
 Performance recording stop ( closing file )
 *****************************************************************/
 instr 5401
-Sname strcpy "/home/olpc/.sugar/default/tamtam/perf.wav"
+Sname strget p4
 turnoff2 5400, 8, 0
 ficlose Sname
 endin
@@ -614,8 +616,9 @@ SynthLab input recording
 ****************************************************************/
 instr 5204
 
-Sname2 sprintf "/home/olpc/.sugar/default/tamtam/snds/lab%d", int(p4)-85
-fout Sname2, 2, gasynth
+Sname sprintf "/lab%d", int(p4)-85
+Sfile strcat gSpath, Sname
+fout Sfile, 2, gasynth
 clear gasynth
 endin
 
@@ -624,6 +627,8 @@ TamTam's SynthLab instrument
 ************************/
 instr 5203
 
+gSpath strget p10
+
 if p5 != 0 then
 event_i "i", 5204, 0, p3, p5
 endif