diff options
author | Oli <olpc@localhost.localdomain> | 2007-02-20 08:47:00 (GMT) |
---|---|---|
committer | Oli <olpc@localhost.localdomain> | 2007-02-20 08:47:00 (GMT) |
commit | ebfe2c6263333d4951a6b6295225d637fe77d4c9 (patch) | |
tree | be51a85324b58c20209ddabda3a5126b9d148dcc /miniTamTam | |
parent | e55322468bc1f86188d05e6e16ecb32be0ae50ce (diff) |
little fixes
Diffstat (limited to 'miniTamTam')
-rw-r--r-- | miniTamTam/KeyboardStandAlone.py | 9 | ||||
-rw-r--r-- | miniTamTam/miniTamTamMain.py | 4 |
2 files changed, 4 insertions, 9 deletions
diff --git a/miniTamTam/KeyboardStandAlone.py b/miniTamTam/KeyboardStandAlone.py index 1848971..033edf2 100644 --- a/miniTamTam/KeyboardStandAlone.py +++ b/miniTamTam/KeyboardStandAlone.py @@ -54,13 +54,8 @@ class KeyboardStandAlone: if GenerationConstants.DRUMPITCH.has_key( pitch ): pitch = GenerationConstants.DRUMPITCH[ pitch ] - if instrument == 'drum1kit': - instrument = Config.DRUM1INSTRUMENTS[ pitch ] - if instrument == 'drum2kit': - instrument = Config.DRUM2INSTRUMENTS[ pitch ] - if instrument == 'drum3kit': - instrument = Config.DRUM3INSTRUMENTS[ pitch ] - + if instrument in Config.DRUMKITS: + instrument = Config.DRUMSINSTRUMENTSDICT[Config.DRUMKITS.index(instrument)][ pitch ] pitch = 36 duration = 100 diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py index e1739a9..3f0710e 100644 --- a/miniTamTam/miniTamTamMain.py +++ b/miniTamTam/miniTamTamMain.py @@ -67,7 +67,7 @@ class miniTamTamMain( gtk.EventBox ): self.leftBox.set_size_request(950,-1) self.rightBox = gtk.VBox() self.mainWindowBox.pack_start(self.leftBox,False,False) - self.mainWindowBox.pack_start(self.rightBox,False,False) + self.mainWindowBox.pack_start(self.rightBox) self.add(self.mainWindowBox) self.enableKeyboard() @@ -113,7 +113,7 @@ class miniTamTamMain( gtk.EventBox ): mainSliderBox.pack_start(volumeSliderBox, True, True, 5) mainSliderBox.pack_start(reverbSliderBox, True, True, 5) - self.leftBox.pack_start(mainSliderBox,False,False) + self.leftBox.pack_start(mainSliderBox, False, False) def drawGeneration( self ): |