fine tunning on drums fill-in in miniTamTam

7 files changed, 100 insertions, 26 deletions

diff --git a/Generation/GenerationConstants.py b/Generation/GenerationConstants.py
index 8be5de2..b4be958 100755
--- a/Generation/GenerationConstants.py
+++ b/Generation/GenerationConstants.py
@@ -158,10 +158,58 @@ class GenerationConstants:
         [ 13, 17, 11, 5, 1, 19, 21, 15, 3, 7, 9, 2, 14, 18, 12, 6, 20, 4, 16, 10, 8, 0 ],
         [ 13, 11, 17, 23, 5, 21, 1, 19, 3, 15, 9, 7, 14, 2, 12, 18, 22, 20, 6, 16, 4, 8, 10, 0 ]  ]
 
-    DRUM_PUNCH_PROB = [[], [(0, 100)], [(0, 100), (12, 35)], [(0, 100), (24, 54), (12, 19)], [(0, 100), (24, 64), (36, 35), (12, 12)], [(0, 100), (36, 71), (24, 46), (48, 25), (12, 8)], [(0, 100), (36, 76), (24, 54), (60, 35), (12, 19), (48, 6)], [(0, 100), (24, 79), (48, 60), (72, 43), (60, 28), (36, 15), (12, 5)], [(0, 100), (48, 81), (24, 64), (72, 49), (36, 35), (84, 22), (60, 12), (12, 4)], [(0, 100), (48, 83), (72, 68), (24, 54), (96, 41), (60, 29), (36, 19), (84, 10), (12, 3)], [(0, 100), (72, 85), (48, 71), (96, 58), (24, 46), (60, 35), (84, 25), (36, 16), (108, 8), (12, 3)], [(0, 100), (48, 86), (72, 74), (120, 62), (96, 50), (24, 40), (60, 30), (84, 21), (108, 14), (36, 7), (12, 2)], [(0, 100), (72, 87), (48, 76), (24, 64), (96, 54), (120, 44), (84, 35), (60, 26), (36, 19), (108, 12), (132, 6), (12, 2)]]
-    DRUM_LOW_PROB = [[], [(0, 100)], [(0, 100), (12, 35)], [(0, 100), (24, 54), (12, 19)], [(0, 100), (24, 64), (36, 35), (12, 12)], [(0, 100), (36, 71), (24, 46), (48, 25), (12, 8)], [(0, 100), (36, 76), (24, 54), (60, 35), (12, 19), (48, 6)], [(0, 100), (24, 79), (48, 60), (72, 43), (60, 28), (36, 15), (12, 5)], [(0, 100), (48, 81), (24, 64), (72, 49), (36, 35), (84, 22), (60, 12), (12, 4)], [(0, 100), (48, 83), (72, 68), (24, 54), (96, 41), (60, 29), (36, 19), (84, 10), (12, 3)], [(0, 100), (72, 85), (48, 71), (96, 58), (24, 46), (60, 35), (84, 25), (36, 16), (108, 8), (12, 3)], [(0, 100), (48, 86), (72, 74), (120, 62), (96, 50), (24, 40), (60, 30), (84, 21), (108, 14), (36, 7), (12, 2)], [(0, 100), (72, 87), (48, 76), (24, 64), (96, 54), (120, 44), (84, 35), (60, 26), (36, 19), (108, 12), (132, 6), (12, 2)]]
-    DRUM_MID_PROB = [[], [(0, 100), (6, 35)], [(0, 100), (12, 64), (18, 35), (6, 12)], [(0, 100), (12, 76), (24, 54), (18, 35), (6, 19), (30, 6)], [(0, 100), (24, 81), (36, 64), (12, 49), (42, 35), (6, 22), (18, 12), (30, 4)], [(0, 100), (36, 85), (24, 71), (48, 58), (12, 46), (6, 35), (30, 25), (18, 16), (54, 8), (42, 3)], [(0, 100), (36, 87), (66, 76), (30, 64), (18, 54), (54, 44), (60, 35), (12, 26), (48, 19), (42, 12), (6, 6), (24, 2)], [(0, 100), (24, 89), (48, 79), (72, 69), (60, 60), (78, 51), (66, 43), (54, 35), (18, 28), (12, 21), (36, 15), (30, 9), (42, 5), (6, 1)], [(0, 100), (48, 90), (24, 81), (72, 73), (36, 64), (84, 57), (12, 49), (60, 42), (42, 35), (90, 28), (6, 22), (54, 17), (18, 12), (66, 8), (30, 4), (78, 1)], [(0, 100), (48, 91), (96, 83), (24, 76), (72, 68), (84, 61), (36, 54), (12, 47), (60, 41), (42, 35), (90, 29), (6, 24), (54, 19), (18, 14), (102, 10), (66, 6), (30, 3), (78, 1)], [(0, 100), (60, 92), (48, 85), (24, 78), (96, 71), (72, 64), (36, 58), (84, 52), (108, 46), (12, 40), (42, 35), (54, 30), (90, 25), (18, 20), (6, 16), (114, 12), (30, 8), (66, 5), (78, 3), (102, 1)], [(0, 100), (48, 93), (60, 86), (96, 80), (24, 74), (120, 67), (36, 62), (72, 56), (108, 50), (84, 45), (12, 40), (54, 35), (42, 30), (18, 26), (90, 21), (126, 17), (114, 14), (6, 10), (30, 7), (66, 5), (102, 2), (78, 0)], [(0, 100), (60, 93), (48, 87), (24, 81), (96, 76), (36, 70), (120, 64), (132, 59), (108, 54), (72, 49), (12, 44), (84, 39), (42, 35), (54, 31), (90, 26), (18, 22), (114, 19), (6, 15), (126, 12), (30, 9), (138, 6), (102, 4), (66, 2), (78, 0)]]
-    DRUM_HIGH_PROB = [[], [(6, 100), (0, 35)], [(6, 100), (18, 64), (12, 35), (0, 12)], [(30, 100), (6, 76), (18, 54), (24, 35), (12, 19), (0, 6)], [(30, 100), (18, 81), (6, 64), (42, 49), (12, 35), (36, 22), (24, 12), (0, 4)], [(42, 100), (54, 85), (18, 71), (30, 58), (6, 46), (12, 35), (48, 25), (24, 16), (36, 8), (0, 3)], [(24, 100), (6, 87), (42, 76), (30, 64), (18, 54), (54, 44), (60, 35), (12, 26), (48, 19), (66, 12), (36, 6), (0, 2)], [(6, 100), (42, 89), (48, 79), (30, 69), (60, 60), (78, 51), (66, 43), (54, 35), (18, 28), (12, 21), (36, 15), (72, 9), (24, 5), (0, 1)], [(78, 100), (30, 90), (66, 81), (18, 73), (54, 64), (6, 57), (90, 49), (60, 42), (42, 35), (12, 28), (84, 22), (36, 17), (72, 12), (24, 8), (48, 4), (0, 1)], [(78, 100), (30, 91), (66, 83), (102, 76), (18, 68), (54, 61), (6, 54), (90, 47), (42, 41), (60, 35), (12, 29), (36, 24), (84, 19), (72, 14), (24, 10), (96, 6), (48, 3), (0, 1)], [(102, 100), (78, 92), (66, 85), (30, 78), (114, 71), (6, 64), (18, 58), (90, 52), (54, 46), (42, 40), (12, 35), (108, 30), (84, 25), (36, 20), (72, 16), (96, 12), (24, 8), (48, 5), (60, 3), (0, 1)], [(78, 100), (102, 93), (66, 86), (30, 80), (6, 74), (114, 67), (126, 62), (90, 56), (18, 50), (42, 45), (54, 40), (12, 35), (84, 30), (108, 26), (72, 21), (36, 17), (120, 14), (24, 10), (96, 7), (60, 5), (48, 2), (0, 0)], [(78, 100), (66, 93), (102, 87), (138, 81), (30, 76), (126, 70), (6, 64), (114, 59), (18, 54), (90, 49), (54, 44), (42, 39), (84, 35), (12, 31), (72, 26), (108, 22), (132, 19), (120, 15), (36, 12), (96, 9), (24, 6), (48, 4), (60, 2), (0, 0)]]
+    DRUM_PUNCH_PROB = [ [], 
+                        [(0, 100)], 
+                        [(0, 100), (12, 35)], 
+                        [(0, 100), (24, 54), (12, 19)], 
+                        [(0, 100), (24, 64), (36, 35), (12, 12)], 
+                        [(0, 100), (36, 71), (24, 46), (48, 25), (12, 8)], 
+                        [(0, 100), (36, 76), (24, 54), (60, 35), (12, 19), (48, 6)], 
+                        [(0, 100), (24, 79), (48, 60), (72, 43), (60, 28), (36, 15), (12, 5)], 
+                        [(0, 100), (48, 81), (24, 64), (72, 49), (36, 35), (84, 22), (60, 12), (12, 4)], 
+                        [(0, 100), (48, 83), (72, 68), (24, 54), (96, 41), (60, 29), (36, 19), (84, 10), (12, 3)], 
+                        [(0, 100), (72, 85), (48, 71), (96, 58), (24, 46), (60, 35), (84, 25), (36, 16), (108, 8), (12, 3)], 
+                        [(0, 100), (48, 86), (72, 74), (120, 62), (96, 50), (24, 40), (60, 30), (84, 21), (108, 14), (36, 7), (12, 2)], 
+                        [(0, 100), (72, 87), (48, 76), (24, 64), (96, 54), (120, 44), (84, 35), (60, 26), (36, 19), (108, 12), (132, 6), (12, 2)]]
+    DRUM_LOW_PROB = [   [], 
+                        [(0, 100)], 
+                        [(0, 100), (12, 35)], 
+                        [(0, 100), (24, 54), (12, 19)], 
+                        [(0, 100), (24, 64), (36, 35), (12, 12)], 
+                        [(0, 100), (36, 71), (24, 46), (48, 25), (12, 8)], 
+                        [(0, 100), (36, 76), (24, 54), (60, 35), (12, 19), (48, 6)], 
+                        [(0, 100), (24, 79), (48, 60), (72, 43), (60, 28), (36, 15), (12, 5)], 
+                        [(0, 100), (48, 81), (24, 64), (72, 49), (36, 35), (84, 22), (60, 12), (12, 4)], 
+                        [(0, 100), (48, 83), (72, 68), (24, 54), (96, 41), (60, 29), (36, 19), (84, 10), (12, 3)], 
+                        [(0, 100), (72, 85), (48, 71), (96, 58), (24, 46), (60, 35), (84, 25), (36, 16), (108, 8), (12, 3)], 
+                        [(0, 100), (48, 86), (72, 74), (120, 62), (96, 50), (24, 40), (60, 30), (84, 21), (108, 14), (36, 7), (12, 2)], 
+                        [(0, 100), (72, 87), (48, 76), (24, 64), (96, 54), (120, 44), (84, 35), (60, 26), (36, 19), (108, 12), (132, 6), (12, 2)]]
+    DRUM_MID_PROB = [   [], 
+                        [(0, 100), (6, 35)], 
+                        [(0, 100), (12, 64), (18, 35), (6, 12)], 
+                        [(0, 100), (12, 76), (24, 54), (18, 35), (6, 19), (30, 6)], 
+                        [(0, 100), (24, 81), (36, 64), (12, 49), (42, 35), (6, 22), (18, 12), (30, 4)], 
+                        [(0, 100), (36, 85), (24, 71), (48, 58), (12, 46), (6, 35), (30, 25), (18, 16), (54, 8), (42, 3)], 
+                        [(0, 100), (36, 87), (66, 76), (30, 64), (18, 54), (54, 44), (60, 35), (12, 26), (48, 19), (42, 12), (6, 6), (24, 2)], 
+                        [(0, 100), (24, 89), (48, 79), (72, 69), (60, 60), (78, 51), (66, 43), (54, 35), (18, 28), (12, 21), (36, 15), (30, 9), (42, 5), (6, 1)], 
+                        [(0, 100), (48, 90), (24, 81), (72, 73), (36, 64), (84, 57), (12, 49), (60, 42), (42, 35), (90, 28), (6, 22), (54, 17), (18, 12), (66, 8), (30, 4), (78, 1)], 
+                        [(0, 100), (48, 91), (96, 83), (24, 76), (72, 68), (84, 61), (36, 54), (12, 47), (60, 41), (42, 35), (90, 29), (6, 24), (54, 19), (18, 14), (102, 10), (66, 6), (30, 3), (78, 1)], 
+                        [(0, 100), (60, 92), (48, 85), (24, 78), (96, 71), (72, 64), (36, 58), (84, 52), (108, 46), (12, 40), (42, 35), (54, 30), (90, 25), (18, 20), (6, 16), (114, 12), (30, 8), (66, 5), (78, 3), (102, 1)], 
+                        [(0, 100), (48, 93), (60, 86), (96, 80), (24, 74), (120, 67), (36, 62), (72, 56), (108, 50), (84, 45), (12, 40), (54, 35), (42, 30), (18, 26), (90, 21), (126, 17), (114, 14), (6, 10), (30, 7), (66, 5), (102, 2), (78, 0)], 
+                        [(0, 100), (60, 93), (48, 87), (24, 81), (96, 76), (36, 70), (120, 64), (132, 59), (108, 54), (72, 49), (12, 44), (84, 39), (42, 35), (54, 31), (90, 26), (18, 22), (114, 19), (6, 15), (126, 12), (30, 9), (138, 6), (102, 4), (66, 2), (78, 0)]]
+    DRUM_HIGH_PROB = [  [], 
+                        [(6, 100), (0, 35)], 
+                        [(6, 100), (18, 64), (12, 35), (0, 12)], 
+                        [(30, 100), (6, 76), (18, 54), (24, 35), (12, 19), (0, 6)], 
+                        [(30, 100), (18, 81), (6, 64), (42, 49), (12, 35), (36, 22), (24, 12), (0, 4)], 
+                        [(42, 100), (54, 85), (18, 71), (30, 58), (6, 46), (12, 35), (48, 25), (24, 16), (36, 8), (0, 3)], 
+                        [(24, 100), (6, 87), (42, 76), (30, 64), (18, 54), (54, 44), (60, 35), (12, 26), (48, 19), (66, 12), (36, 6), (0, 2)], 
+                        [(6, 100), (42, 89), (48, 79), (30, 69), (60, 60), (78, 51), (66, 43), (54, 35), (18, 28), (12, 21), (36, 15), (72, 9), (24, 5), (0, 1)], 
+                        [(78, 100), (30, 90), (66, 81), (18, 73), (54, 64), (6, 57), (90, 49), (60, 42), (42, 35), (12, 28), (84, 22), (36, 17), (72, 12), (24, 8), (48, 4), (0, 1)], 
+                        [(78, 100), (30, 91), (66, 83), (102, 76), (18, 68), (54, 61), (6, 54), (90, 47), (42, 41), (60, 35), (12, 29), (36, 24), (84, 19), (72, 14), (24, 10), (96, 6), (48, 3), (0, 1)], 
+                        [(102, 100), (78, 92), (66, 85), (30, 78), (114, 71), (6, 64), (18, 58), (90, 52), (54, 46), (42, 40), (12, 35), (108, 30), (84, 25), (36, 20), (72, 16), (96, 12), (24, 8), (48, 5), (60, 3), (0, 1)], 
+                        [(78, 100), (102, 93), (66, 86), (30, 80), (6, 74), (114, 67), (126, 62), (90, 56), (18, 50), (42, 45), (54, 40), (12, 35), (84, 30), (108, 26), (72, 21), (36, 17), (120, 14), (24, 10), (96, 7), (60, 5), (48, 2), (0, 0)], 
+                        [(78, 100), (66, 93), (102, 87), (138, 81), (30, 76), (126, 70), (6, 64), (114, 59), (18, 54), (90, 49), (54, 44), (42, 39), (84, 35), (12, 31), (72, 26), (108, 22), (132, 19), (120, 15), (36, 12), (96, 9), (24, 6), (48, 4), (60, 2), (0, 0)]]
 
     # Gain boundaries
     GAIN_MAX_BOUNDARY = 1.
diff --git a/Welcome.py b/Welcome.py
index 248a24c..6255a5b 100644
--- a/Welcome.py
+++ b/Welcome.py
@@ -53,9 +53,10 @@ class Welcome(SubActivity):
             i = 0
             csnd = new_csound_client()
             beat = 8
+            density = 0.8
             regularity = 0.77
             reverb = 0.2
-            for x in flatten( generator('drum3kit', beat, regularity, reverb) ):
+            for x in flatten( generator('drum3kit', beat, density, regularity, reverb) ):
                 n = Note(0, x.trackId, i, x)
                 i = i + 1
                 csnd.loopPlay(n,1) # add as active
diff --git a/miniTamTam/Fillin.py b/miniTamTam/Fillin.py
index 2fe7578..0825d44 100644
--- a/miniTamTam/Fillin.py
+++ b/miniTamTam/Fillin.py
@@ -17,6 +17,8 @@ class Fillin:
         self.tempo = tempo
         self.instrument = instrument
         self.reverb = reverb
+        self.onsets = []
+        self.pitchs = []
         self.playBackTimeout = None
         self.csnd = new_csound_client()
 
@@ -28,6 +30,9 @@ class Fillin:
         self.instrument = instrument
  
     def setBeats( self, nbeats ):
+        if self.playBackTimeout != None:
+            gobject.source_remove( self.playBackTimeout )
+
         self.nbeats = nbeats
         self.clear()
         self.reset()
@@ -74,6 +79,10 @@ class Fillin:
                     self.regenerate()
         return True    
 
+    def unavailable( self, onsets, pitchs ):
+        self.onsets = onsets
+        self.pitchs = pitchs
+
     def regenerate(self):
         def flatten(ll):
             rval = []
@@ -82,9 +91,10 @@ class Fillin:
             return rval
         i = 500
         self.notesList= []
-        for x in flatten( generator(self.instrument, self.nbeats, 0, self.reverb) ):
-            n = Note(0, x.trackId, i, x)
-            self.notesList.append(n)
-            i += 1  
-            self.csnd.loopPlay(n,1)                    #add as active
+        for x in flatten( generator(self.instrument, self.nbeats, 0.4, 0.1, self.reverb) ):
+            if x.onset not in self.onsets or x.pitch not in self.pitchs:
+                n = Note(0, x.trackId, i, x)
+                self.notesList.append(n)
+                i += 1  
+                self.csnd.loopPlay(n,1)                    #add as active
  
diff --git a/miniTamTam/GenRythm.py b/miniTamTam/GenRythm.py
index eba0eb8..97bd2c0 100644
--- a/miniTamTam/GenRythm.py
+++ b/miniTamTam/GenRythm.py
@@ -5,13 +5,12 @@ from Generation.GenerationConstants import GenerationConstants
 from Generation.Utils import *
 
 class GenRythm:
-    def drumRythmSequence(self, instrument, nbeats, regularity ):
+    def drumRythmSequence(self, instrument, nbeats, density, regularity ):
         rythmSequence = []
         binSelection = []
         downBeats = []
         upBeats = []
         beats = []
-        density = 0.8
         countDown = 0
         onsetTime = None
 
@@ -23,7 +22,7 @@ class GenRythm:
                 upBeats.append( ( downBeat[ 0 ] +  Config.TICKS_PER_BEAT , downBeat[ 1 ] ) )
 
         if Config.INSTRUMENTS[ instrument ].instrumentRegister == Config.LOW:
-            registerDensity =1.5
+            registerDensity =1
             downBeatRecurence = 4
             downBeats = GenerationConstants.DRUM_LOW_PROB[ nbeats ]
             for downBeat in downBeats:
@@ -43,7 +42,12 @@ class GenRythm:
             for downBeat in downBeats:
                 upBeats.append( ( downBeat[ 0 ] +  Config.TICKS_PER_BEAT / 4 , downBeat[ 1 ] ) )
 
-        for i in range( int( density * registerDensity * len( downBeats ) ) ):
+        realDensity = density * registerDensity
+        if realDensity > 1.:
+            realDensity = 1.
+
+        list = range( int( realDensity  * len( downBeats ) ) )
+        for i in list:
             if random.random() < ( regularity * downBeatRecurence ) and binSelection.count( 1 ) < len( downBeats ): 
                 binSelection.append( 1 )        
             else:
diff --git a/miniTamTam/RythmGenerator.py b/miniTamTam/RythmGenerator.py
index b7fb21b..539274c 100644
--- a/miniTamTam/RythmGenerator.py
+++ b/miniTamTam/RythmGenerator.py
@@ -1,12 +1,11 @@
 import random
-import math
 
 import Config
 from Util.CSoundNote import CSoundNote
 from Generation.GenerationConstants import GenerationConstants
 from GenRythm import GenRythm
 
-def generator( instrument, nbeats, regularity, reverbSend ):
+def generator( instrument, nbeats, density, regularity, reverbSend ):
 
     makeRythm = GenRythm()
 
@@ -22,12 +21,16 @@ def generator( instrument, nbeats, regularity, reverbSend ):
  
     def makePitchSequence(length, drumPitch):
         pitchSequence = []
-        for i in range(length):
-            pitchSequence.append(drumPitch[ random.randint( 0, ( len( drumPitch ) - 1 )  ) ] )         
+        append = pitchSequence.append
+        list = range(length)
+        max = len(drumPitch) - 1
+        for i in list:
+            append(drumPitch[ random.randint( 0, max ) ] )         
         return pitchSequence 
 
     def makeGainSequence( onsetList ):
         gainSequence = []
+        append = gainSequence.append
         for onset in onsetList:
             if onset == 0:
                 gain = random.uniform(GenerationConstants.GAIN_MID_MAX_BOUNDARY, GenerationConstants.GAIN_MAX_BOUNDARY)
@@ -35,7 +38,7 @@ def generator( instrument, nbeats, regularity, reverbSend ):
                 gain = random.uniform(GenerationConstants.GAIN_MID_MIN_BOUNDARY, GenerationConstants.GAIN_MID_MAX_BOUNDARY)
             else:     
                 gain = random.uniform(GenerationConstants.GAIN_MIN_BOUNDARY, GenerationConstants.GAIN_MID_MIN_BOUNDARY)
-            gainSequence.append(gain*2)
+            append(gain)
         return gainSequence  
                 
     def pageGenerate( regularity, drumPitch ):
@@ -44,16 +47,19 @@ def generator( instrument, nbeats, regularity, reverbSend ):
         if Config.INSTRUMENTS[instrument].kit != None:
             currentInstrument = Config.INSTRUMENTS[instrument].kit[drumPitch[0]].name
 
-        rythmSequence = makeRythm.drumRythmSequence(currentInstrument, nbeats, regularity)
+        rythmSequence = makeRythm.drumRythmSequence(currentInstrument, nbeats, density, regularity)
         pitchSequence = makePitchSequence(len(rythmSequence), drumPitch )
         gainSequence = makeGainSequence(rythmSequence)
 
         trackNotes = []
-        for i in range(len(rythmSequence)):
+        list = range(len(rythmSequence))
+        for i in list:
             trackNotes.append( CSoundNote( rythmSequence[i], pitchSequence[i], gainSequence[i], 
                                            pan, noteDuration, trackId, 
-                                           Config.INSTRUMENTS[instrument].instrumentId, attack, decay, reverbSend, filterType, filterCutoff, tied, mode ) )
+                                           Config.INSTRUMENTS[instrument].instrumentId, attack, 
+                                           decay, reverbSend, filterType, filterCutoff, tied, mode))
         return trackNotes
+
 ################################################################################## 
     #  begin generate() 
     if regularity > 0.75:
diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py
index 64ed76c..82dce2a 100644
--- a/miniTamTam/miniTamTamMain.py
+++ b/miniTamTam/miniTamTamMain.py
@@ -42,8 +42,8 @@ class miniTamTamMain(SubActivity):
         self.reverb = 0.
         self.tempo = Config.PLAYER_TEMPO
         self.rythmInstrument = 'drum1kit'
-        self.regenerate()
         self.drumFillin = Fillin( self.beat, self.tempo, self.rythmInstrument, self.reverb )
+        self.regenerate()
         self.sequencer= MiniSequencer(self.recordStateButton)
         self.csnd.loopSetTempo(self.tempo)
         self.noteList = []
@@ -270,16 +270,21 @@ class miniTamTamMain(SubActivity):
             for l in ll:
                 rval += l
             return rval
+        noteOnsets = []
+        notePitchs = []
         i = 0
         self.noteList= []
         self.csnd.loopClear()
-        for x in flatten( generator(self.rythmInstrument, self.beat, self.regularity, self.reverb) ):
+        for x in flatten( generator(self.rythmInstrument, self.beat, 0.8, self.regularity, self.reverb) ):
+            noteOnsets.append(x.onset)
+            notePitchs.append(x.pitch)
             n = Note(0, x.trackId, i, x)
             self.noteList.append( (x.onset, n) )
             i = i + 1
             self.csnd.loopPlay(n,1)                    #add as active
         self.csnd.loopSetNumTicks( self.beat * Config.TICKS_PER_BEAT)
-        
+        self.drumFillin.unavailable( noteOnsets, notePitchs )
+
     def handleClose(self,widget):
         if self.playStopButton.get_active() == True:
             self.playStopButton.set_active(False)  
diff --git a/scripts/olpc_get_stuff.sh b/scripts/olpc_get_stuff.sh
index a6dc45b..be55b1b 100755
--- a/scripts/olpc_get_stuff.sh
+++ b/scripts/olpc_get_stuff.sh
@@ -1,7 +1,7 @@
 
 #NEED_FOR_SURE='vim-common vim-enhanced screen git-core ctags sox irssi diffutils'
 #ALTERNATE_WM='xterm fluxbox'
-GCC_STUFF='gcc make python-devel gcc-c++ csound-devel swig'
+GCC_STUFF='gcc make python-devel gcc-c++ csound-devel swig alsa-lib-devel'
 
 yum install $NEED_FOR_SURE $ALTERNATE_WM $GCC_STUFF