Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/Util/CSoundClient.py
diff options
context:
space:
mode:
authoramartin <olpc@localhost.localdomain>2007-03-04 19:09:10 (GMT)
committer amartin <olpc@localhost.localdomain>2007-03-04 19:09:10 (GMT)
commit39da26fa4a371868e21c6e3e0083161cf7b9efbe (patch)
treeae6fcc2960881f32fdd804c1118506c1fa63508f /Util/CSoundClient.py
parentf30b36406907dc1956a18c550fe2fdfa151323f4 (diff)
drum pitch (instrument) updates correctly, generation is now a popup, updated duplicate images
Diffstat (limited to 'Util/CSoundClient.py')
-rw-r--r--Util/CSoundClient.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/Util/CSoundClient.py b/Util/CSoundClient.py
index 4d30dbb..d50235a 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):