From df75dd3b08c5ae87cc0c9d43870a5a73467eeb0f Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Fri, 19 Dec 2008 00:24:50 +0000
Subject: add kitStage member to Instrument class; refactor code to use .kit and .kitStage instead of .name parsing

---
(limited to 'TamTamJam.activity/Jam/JamMain.py')

diff --git a/TamTamJam.activity/Jam/JamMain.py b/TamTamJam.activity/Jam/JamMain.py
index 53f2798..77e97d1 100644
--- a/TamTamJam.activity/Jam/JamMain.py
+++ b/TamTamJam.activity/Jam/JamMain.py
@@ -173,11 +173,13 @@ class JamMain(gtk.EventBox):
         self.pixelsPerTick = Block.Loop.BEAT/float(Config.TICKS_PER_BEAT)
         self.ticksPerPixel = 1.0/self.pixelsPerTick
 
-        #-- Instrument Images ---------------------------------
+        #-- Instruments ---------------------------------------
         self.instrumentImage = {}
         self.instrumentImageActive = {}
         for inst in self.instrumentDB.getSet( "All" ):
-            self.prepareInstrumentImage( inst.instrumentId, inst.img )
+            if not inst.kitStage:
+                self.prepareInstrumentImage( inst.instrumentId, inst.img )
+            self.csnd.load_instrument(inst.name)
 
         #-- Loop Images ---------------------------------------
         self.loopImage = {}       # get filled in through updateLoopImage
--
cgit v0.9.1