diff options
author | Oli <olpc@localhost.localdomain> | 2007-03-05 00:15:48 (GMT) |
---|---|---|
committer | Oli <olpc@localhost.localdomain> | 2007-03-05 00:15:48 (GMT) |
commit | dd0557c14eef88dd4d69e4fa4a9217e509ad30ac (patch) | |
tree | 60591ac7521482518d9cec2986188625b49fc81e /Util/CSoundClient.py | |
parent | 74d7de4b639a1f2fcf61473e6ff40f4d0a3b0f46 (diff) | |
parent | 44ae765f4727196c4455148efc0849511e1e4aeb (diff) |
Merge branch 'master' of git+ssh://olipet@dev.laptop.org/git/projects/tamtam
Diffstat (limited to 'Util/CSoundClient.py')
-rw-r--r-- | Util/CSoundClient.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Util/CSoundClient.py b/Util/CSoundClient.py index 2f2ed48..d5f7e30 100644 --- a/Util/CSoundClient.py +++ b/Util/CSoundClient.py @@ -126,10 +126,14 @@ class _CSoundClientPlugin: if (Config.DEBUG > 2): print 'INFO: updating pitch', (page<<16)+id, value pitch = value if Config.INSTRUMENTSID[note.cs.instrumentId].kit != None: - instr = Config.INSTRUMENTSID[note.cs.instrumentId].kit[pitch].name + instrument = Config.INSTRUMENTSID[note.cs.instrumentId].kit[pitch] + csoundInstId = instrument.csoundInstrumentId + csoundTable = Config.INSTRUMENT_TABLE_OFFSET + instrument.instrumentId + if (Config.DEBUG > 2): print 'INFO: updating drum instrument (pitch)', (page<<16)+id, instrument.name, csoundInstId + sc_loop_updateEvent( (page<<16)+id, 0, csoundInstId + note.track * 0.01, -1 ) + sc_loop_updateEvent( (page<<16)+id, 7, csoundTable , -1 ) pitch = 1 else: - instr = Config.INSTRUMENTSID[note.cs.instrumentId].name pitch = GenerationConstants.TRANSPOSE[ pitch - 24 ] sc_loop_updateEvent( (page<<16)+id, 3, pitch, cmd) elif (parameter == NoteDB.PARAMETER.AMPLITUDE): |