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 /TamTamMini.activity | |
| parent | 9bb74bd2bb85cb5fc51f81b6f28e4291c3cdf286 (diff) | |
add kitStage member to Instrument class; refactor code to use .kit and .kitStage instead of .name parsing
Diffstat (limited to 'TamTamMini.activity')
| -rw-r--r-- | TamTamMini.activity/Mini/InstrumentPanel.py | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/TamTamMini.activity/Mini/InstrumentPanel.py b/TamTamMini.activity/Mini/InstrumentPanel.py index 1661e45..5355b30 100644 --- a/TamTamMini.activity/Mini/InstrumentPanel.py +++ b/TamTamMini.activity/Mini/InstrumentPanel.py @@ -118,7 +118,7 @@ class InstrumentPanel( gtk.EventBox ): def loadInstrumentList( self, timeout = -1, loadStage = [0,0,0] ): if loadStage[1] == 0: - self.instrumentList = { "all": [], "all.enterMode": [], "percussions.enterMode": [], "mysounds": [], "kit": [] } + self.instrumentList = { "all": [], "all.enterMode": [], "percussions.enterMode": [], "mysounds": [] } for category in Config.CATEGORIES: self.instrumentList[category] = [] loadStage[1] = 1 @@ -133,16 +133,14 @@ class InstrumentPanel( gtk.EventBox ): continue instrument = self.instrumentDB.instNamed[key] - if key[0:4] != 'drum' and key[0:4] != 'guid' and key[0:3] != 'mic' and key[0:3] != 'lab': - self.instrumentList["all"].append( key ) - if key[0:4] != 'drum' and key[0:4] != 'guid' and key[0:3] != 'mic' and key[0:3] != 'lab': - self.instrumentList["all.enterMode"].append( key ) - if key[0:4] != 'drum' and key[0:4] != 'guid': + + if not instrument.kitStage and not instrument.kit: + if not key.startswith('mic') and not key.startswith('lab'): + self.instrumentList["all"].append( key ) + self.instrumentList["all.enterMode"].append( key ) self.instrumentList[instrument.category].append( key ) if instrument.category == "percussions": self.instrumentList["percussions.enterMode"].append( key ) - if instrument.category == "kit": - self.instrumentList["kit"].append( key ) loadStage[2] += 1 if timeout >= 0 and time.time() > timeout: return False @@ -151,9 +149,8 @@ class InstrumentPanel( gtk.EventBox ): self.instrumentList["mysounds"].sort() - self.instrumentList["all"] += self.instrumentList["kit"] + self.instrumentList["mysounds"] + self.instrumentList["all"] += self.instrumentList["mysounds"] self.instrumentList["all.enterMode"] += self.instrumentList["mysounds"] - self.instrumentList["percussions"] += self.instrumentList["kit"] loadStage[1] = 0 return True |