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

7 files changed, 39 insertions, 2 deletions

diff --git a/Resources/Images/dupNote.png b/Resources/Images/dupNote.png
index b6542c9..e18d1b6 100644
--- a/Resources/Images/dupNote.png
+++ b/Resources/Images/dupNote.png
diff --git a/Resources/Images/dupNoteDown.png b/Resources/Images/dupNoteDown.png
index 6c09e7f..68be960 100644
--- a/Resources/Images/dupNoteDown.png
+++ b/Resources/Images/dupNoteDown.png
diff --git a/Resources/Images/dupNoteOver.png b/Resources/Images/dupNoteOver.png
index d913784..c5dbe4a 100644
--- a/Resources/Images/dupNoteOver.png
+++ b/Resources/Images/dupNoteOver.png
diff --git a/Resources/Images/dupTrack.png b/Resources/Images/dupTrack.png
index a1183e7..26def4d 100644
--- a/Resources/Images/dupTrack.png
+++ b/Resources/Images/dupTrack.png
diff --git a/Resources/Images/dupTrackDown.png b/Resources/Images/dupTrackDown.png
index d2b08c8..1795551 100644
--- a/Resources/Images/dupTrackDown.png
+++ b/Resources/Images/dupTrackDown.png
diff --git a/Resources/Images/dupTrackOver.png b/Resources/Images/dupTrackOver.png
index 49863e4..c5035ad 100644
--- a/Resources/Images/dupTrackOver.png
+++ b/Resources/Images/dupTrackOver.png
diff --git a/Resources/univorc.csd b/Resources/univorc.csd
index 2037cb1..900e6ba 100644
--- a/Resources/univorc.csd
+++ b/Resources/univorc.csd
@@ -642,7 +642,7 @@ endin
 
 
 /****************************************************************
-Soundfile player with tied notes
+Soundfile player with miniTamTam's tied notes
 ****************************************************************/
 instr 5999
 
@@ -719,7 +719,7 @@ kcd         portk   p15, igliss, p15
 kpitchBend port gkTrackpadX, .03, i(gkTrackpadX)
 kampBend port gkTrackpadY, .03, i(gkTrackpadY)
  
-a1	     flooper2	1*(1+kampBend)+ktremolo, kpitch*(1+kpitchBend)+kvibrato, kls, kle, kcd, p8, 0, 0, 0, iskip
+a1	     flooper2	(1+kampBend)+ktremolo, kpitch*(1+kpitchBend)+kvibrato, kls, kle, kcd, p8, 0, 0, 0, iskip
 
 if (p11-1) != -1 then
 acomp   =  a1
@@ -737,6 +737,42 @@ gainrev	=	        a1*krg+gainrev
   tieskip:                                    
 endin
 
+
+/*************************
+Soundfile player with edit's looped notes
+*************************/
+instr 5101, 5102, 5103, 5104, 5105, 5106, 5107, 5108, 5109, 5110
+
+iTrackId = int(p1-5101)
+SvolTrackName2 sprintf "trackVolume%0d", iTrackId
+kvol chnget SvolTrackName2
+kvol = kvol * 0.01
+kvol port kvol, .01, 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
+
+if (p11-1) != -1 then
+acomp   =  a1
+a1      bqrez   a1, p12, 6, p11-1
+a1      balance     a1, acomp
+endif
+
+kenv   adsr     p9, 0.05, p6, p10
+a1      =   a1*kenv*kvol
+
+gaoutL = a1*(1-p7)+gaoutL
+gaoutR =  a1*p7+gaoutR
+
+gainrev	= a1*p5+gainrev
+
+endin
+
 /**************************************************************
 Simple soundfile player
 **************************************************************/
@@ -754,6 +790,7 @@ event_i "i", p4, i2, p6, p7, p8, p9, p10, p11, p12, p13, p14
 endin
 
 instr 5011, 5012, 5013, 5014, 5015, 5016, 5017, 5018, 5019, 5020
+
 iTrackId = int(p1-5011)
 SvolTrackName1 sprintf "trackVolume%0d", iTrackId
 kvol chnget SvolTrackName1