From cd62e6af4d8f4dda887f1aac15abb13128a7f447 Mon Sep 17 00:00:00 2001
From: Oli <olivier.belanger@umontreal.ca>
Date: Sat, 20 Oct 2007 17:25:17 +0000
Subject: removed csound table's load from startup

---
(limited to 'TamTamMini.activity/Mini')

diff --git a/TamTamMini.activity/Mini/InstrumentPanel.py b/TamTamMini.activity/Mini/InstrumentPanel.py
index b28e969..a35b774 100644
--- a/TamTamMini.activity/Mini/InstrumentPanel.py
+++ b/TamTamMini.activity/Mini/InstrumentPanel.py
@@ -301,6 +301,7 @@ class InstrumentPanel( gtk.EventBox ):
             if self.setInstrument:
                 widget.event( gtk.gdk.Event( gtk.gdk.LEAVE_NOTIFY )  ) # fake the leave event
                 self.setInstrument(instrument)
+            time.sleep(0.05)
             if self.playInstrument: self.playInstrument(instrument)
             if self.enterMode:
                 pass #Close the window
diff --git a/TamTamMini.activity/Mini/miniTamTamMain.py b/TamTamMini.activity/Mini/miniTamTamMain.py
index c410a86..ed92955 100644
--- a/TamTamMini.activity/Mini/miniTamTamMain.py
+++ b/TamTamMini.activity/Mini/miniTamTamMain.py
@@ -62,6 +62,7 @@ class miniTamTamMain(gtk.EventBox):
         self.beatDuration = 60.0/self.tempo
         self.ticksPerSecond = Config.TICKS_PER_BEAT*self.tempo/60.0
         self.rythmInstrument = 'drum1kit'
+        self.csnd.load_drumkit(self.rythmInstrument)
         self.muteInst = False
         self.drumFillin = Fillin( self.beat, self.tempo, self.rythmInstrument, self.reverb, self.drumVolume )
         self.sequencer= MiniSequencer(self.recordStateButton, self.recordOverSensitivity)
@@ -566,6 +567,7 @@ class miniTamTamMain(gtk.EventBox):
         #data is drum1kit, drum2kit, or drum3kit
         #print 'HANDLE: Generate Button'
         self.rythmInstrument = data
+        self.csnd.load_drumkit(data)
         instrumentId = self.instrumentDB.instNamed[data].instrumentId
         for (o,n) in self.noteList :
             self.csnd.loopUpdate(n, NoteDB.PARAMETER.INSTRUMENT, instrumentId, -1)
@@ -587,6 +589,7 @@ class miniTamTamMain(gtk.EventBox):
     def setInstrument( self , instrument ):
         self.instrument = instrument
         self.keyboardStandAlone.setInstrument(instrument)
+        self.csnd.load_instrument(instrument)
 
     def playInstrumentNote(self , instrument, secs_per_tick = 0.025):
         if not self.muteInst:
--
cgit v0.9.1