diff options
| author | James <olpc@localhost.localdomain> | 2007-02-20 20:04:56 (GMT) |
|---|---|---|
| committer | James <olpc@localhost.localdomain> | 2007-02-20 20:04:56 (GMT) |
| commit | c709aba61c557c36c1bf761e0f9c8b95e0cdfd10 (patch) | |
| tree | 149297a92f0dcbdfdd30ef167fd55900f58f3af3 /Util/CSoundClient.py | |
| parent | d26d1270bd7f3c1f9e11db5955ffb2964108a4b4 (diff) | |
| parent | 16cc50c2a811234429fc00b139a537cb5281ae61 (diff) | |
Merge branch 'master' of git+ssh://jaberg@dev.laptop.org/git/projects/tamtam
Diffstat (limited to 'Util/CSoundClient.py')
| -rw-r--r-- | Util/CSoundClient.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Util/CSoundClient.py b/Util/CSoundClient.py index eb80ce4..913e143 100644 --- a/Util/CSoundClient.py +++ b/Util/CSoundClient.py @@ -213,12 +213,9 @@ class _CSoundClientPlugin: else: key = pitch - if instr == 'drum1kit': - instr = Config.DRUM1INSTRUMENTS[ key ] - if instr == 'drum2kit': - instr = Config.DRUM2INSTRUMENTS[ key ] - if instr == 'drum3kit': - instr = Config.DRUM3INSTRUMENTS[ key ] + if instr in Config.DRUMKITS: + instr = Config.DRUMSINSTRUMENTSDICT[Config.DRUMKITS.index(instr)][ key ] + pitch = 1 time_in_ticks = 0 else: |