diff options
| author | amartin <olpc@localhost.localdomain> | 2007-03-01 23:23:38 (GMT) |
|---|---|---|
| committer | amartin <olpc@localhost.localdomain> | 2007-03-01 23:23:38 (GMT) |
| commit | 4a2707833481847966876009c21b4842671df4b4 (patch) | |
| tree | e1031144155c1383936d68a7a0f7b21cfae390cb /Generation | |
| parent | b048a6c2cf509e5f78bda23c0888abd4d230b626 (diff) | |
CSoundNote now uses .instrumentId, and .instrument and .instrumentFlag are no longer valid
BE WARNED!?
Diffstat (limited to 'Generation')
| -rwxr-xr-x | Generation/Generator.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Generation/Generator.py b/Generation/Generator.py index 3dbd3cb..3b42f35 100755 --- a/Generation/Generator.py +++ b/Generation/Generator.py @@ -102,7 +102,7 @@ def generator1( trackNotes = trackOfNotes barLength = Config.TICKS_PER_BEAT * nbeats if drumPitch: - currentInstrument = Config.DRUMSINSTRUMENTSDICT[Config.DRUMKITS.index(instrument[ trackId ])][ drumPitch[ 0 ] ] + currentInstrument = Config.INSTRUMENTS[instrument[ trackId ]].kit[drumPitch[0]].name else: drumPitch = [ 36 ] currentInstrument = instrument[ trackId ] @@ -133,7 +133,7 @@ def generator1( if random.random() > parameters.silence: trackNotes.append( CSoundNote( rythmSequence[i], pitchSequence[i], gainSequence[i], GenerationConstants.DEFAULT_PAN, durationSequence[i], trackId, - fullDurationSequence[i], instrument[ trackId ] ) ) + fullDurationSequence[i], Config.INSTRUMENTS[instrument[ trackId ]].instrumentId ) ) # del trackDictionary[ trackId ][ pageId ] trackDictionary[ trackId ][ pageId ] = trackNotes |