diff options
| author | Aleksey Lim <alsroot@member.fsf.org> | 2008-12-19 00:24:50 (GMT) |
|---|---|---|
| committer | Aleksey Lim <alsroot@member.fsf.org> | 2008-12-19 23:50:57 (GMT) |
| commit | df75dd3b08c5ae87cc0c9d43870a5a73467eeb0f (patch) | |
| tree | 877c8d81c47c71a38b824ca3f73c69edc7b5e783 /TamTamJam.activity/Jam/JamMain.py | |
| parent | 9bb74bd2bb85cb5fc51f81b6f28e4291c3cdf286 (diff) | |
add kitStage member to Instrument class; refactor code to use .kit and .kitStage instead of .name parsing
Diffstat (limited to 'TamTamJam.activity/Jam/JamMain.py')
| -rw-r--r-- | TamTamJam.activity/Jam/JamMain.py | 6 |
1 files changed, 4 insertions, 2 deletions
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 |