diff options
author | Oli <olivier.belanger@umontreal.ca> | 2007-10-19 08:08:02 (GMT) |
---|---|---|
committer | Oli <olivier.belanger@umontreal.ca> | 2007-10-19 08:08:02 (GMT) |
commit | 3e9a586f404b70cda362cf888653de9c940fd849 (patch) | |
tree | 427a99619ebf947600a3cc2c0ef9437fb2953f09 /TamTamMini.activity/Mini/InstrumentPanel.py | |
parent | 9307df223f0be4193a21fddd48e32ce15b9ed4ef (diff) |
switch to instrumentDB
Diffstat (limited to 'TamTamMini.activity/Mini/InstrumentPanel.py')
-rw-r--r-- | TamTamMini.activity/Mini/InstrumentPanel.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/TamTamMini.activity/Mini/InstrumentPanel.py b/TamTamMini.activity/Mini/InstrumentPanel.py index 8cac210..b28e969 100644 --- a/TamTamMini.activity/Mini/InstrumentPanel.py +++ b/TamTamMini.activity/Mini/InstrumentPanel.py @@ -8,12 +8,15 @@ import time import common.Config as Config from common.Util.ThemeWidgets import * +from common.Util import InstrumentDB + Tooltips = Config.Tooltips class InstrumentPanel( gtk.EventBox ): def __init__(self,setInstrument = None, playInstrument = None, enterMode = False, micRec = None, synthRec = None, rowLen = 8, _instDic = None, force_load = True ): gtk.EventBox.__init__(self) + self.instrumentDB = InstrumentDB.getRef() self.setInstrument = setInstrument self.playInstrument = playInstrument self.micRec = micRec @@ -116,10 +119,10 @@ class InstrumentPanel( gtk.EventBox ): if timeout >= 0 and time.time() > timeout: return False if loadStage[1] == 1: - keys = Config.INSTRUMENTS.keys() + keys = self.instrumentDB.instNamed.keys() for i in range(loadStage[2], len(keys)): key = keys[i] - instrument = Config.INSTRUMENTS[key] + 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': @@ -333,9 +336,9 @@ class DrumPanel( gtk.EventBox ): self.setDrum = setDrum self.instrumentList = [] - keys = Config.INSTRUMENTS.keys() - for key in Config.INSTRUMENTS.keys(): - if Config.INSTRUMENTS[key].category == "kit": + keys = self.instrumentDB.instNamed.keys() + for key in keys: + if self.instrumentDB.instNamed[key].category == "kit": self.instrumentList.append( key ) self.instrumentList.sort() self.drawDrums() |