diff options
author | Nat <natcl@hotmail.com> | 2007-07-09 12:02:00 (GMT) |
---|---|---|
committer | Nat <natcl@hotmail.com> | 2007-07-09 12:02:00 (GMT) |
commit | c4a213dbf615def5ebbc2f2606fcf7a465f9a501 (patch) | |
tree | 90dc8150a1905886e2a963368a5fa681e99fb397 /Resources | |
parent | 7d6127977b0b22db5e648322fde9ffdfec464be4 (diff) | |
parent | f58665c0d3e0683b6ceed4911a7837cdc1243ba5 (diff) |
Merge branch 'master' of git+ssh://natcl@dev.laptop.org/git/projects/tamtam
Diffstat (limited to 'Resources')
-rw-r--r-- | Resources/crop.csd | 2 | ||||
-rw-r--r-- | Resources/univorc.csd | 12 |
2 files changed, 5 insertions, 9 deletions
diff --git a/Resources/crop.csd b/Resources/crop.csd index 8222b9d..36b0393 100644 --- a/Resources/crop.csd +++ b/Resources/crop.csd @@ -28,7 +28,7 @@ instr 2 itab = 1 ain = gasig krms rms ain -ktrig trigger krms, 2000, 0 +ktrig trigger krms, 1500, 0 if ktrig == 1 then event "i", 3, 0, 1 diff --git a/Resources/univorc.csd b/Resources/univorc.csd index 03992e1..1a4093b 100644 --- a/Resources/univorc.csd +++ b/Resources/univorc.csd @@ -583,7 +583,7 @@ SynthLab input recording instr 5204 Sname2 sprintf "/home/olpc/.sugar/default/tamtam/lab%d", int(p4)-85 -fout Sname2, 2, gasynth*4 +fout Sname2, 2, gasynth * 0.707 clear gasynth endin @@ -679,7 +679,7 @@ iFxOut4 table 15, 5206 aout = (aSource1*iSourceOut1)+(aSource2*iSourceOut2)+(aSource3*iSourceOut3)+(aSource4*iSourceOut4)+(aFx1*iFxOut1)+(aFx2*iFxOut2)+(aFx3*iFxOut3)+(aFx4*iFxOut4) kenv adsr p3*p6+0.001, p3*p7, p8, p3*p9 -aout = aout*kenv*0.66 +aout = aout*kenv vincr gasynth, aout @@ -772,10 +772,8 @@ kpitchBend pow kpitchBend + 1, 5 kampBend port gkTrackpadY, .03, i(gkTrackpadY) kampBend pow kampBend + 1, 5 -itreRand random 4, 6 ivibRand random 4.1, 5.7 -ktremolo oscil .15, itreRand, 1 kvibrato oscil .006*kampBend, ivibRand*kpitchBend, 1 tigoto tieskip @@ -788,7 +786,7 @@ kls portk p13, igliss, p13 kle portk p14, igliss, p14 kcd portk p15, igliss, p15 -a1 flooper2 1+ktremolo, kpitch+kvibrato, kls, kle, kcd, p8, 0, 0, 0, iskip +a1 flooper2 1, kpitch+kvibrato, kls, kle, kcd, p8, 0, 0, 0, iskip if (p11-1) != -1 then acomp = a1 @@ -826,13 +824,11 @@ kvol chnget SvolTrackName2 kvol = kvol * 0.01 kvol port kvol, .01, 0 ;i(kvol) -itreRand random 4, 6 ivibRand random 4.1, 5.7 -ktremolo oscil .15, itreRand, 1 kvibrato oscil .006, ivibRand, 1 -a1 flooper2 1+ktremolo, p4+kvibrato, p13, p14, p15, p8, 0, 0, 0 +a1 flooper2 1, p4+kvibrato, p13, p14, p15, p8, 0, 0, 0 if (p11-1) != -1 then acomp = a1 |