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 /miniTamTam | |
| parent | b048a6c2cf509e5f78bda23c0888abd4d230b626 (diff) | |
CSoundNote now uses .instrumentId, and .instrument and .instrumentFlag are no longer valid
BE WARNED!?
Diffstat (limited to 'miniTamTam')
| -rw-r--r-- | miniTamTam/KeyboardStandAlone.py | 9 | ||||
| -rw-r--r-- | miniTamTam/RythmGenerator.py | 6 | ||||
| -rw-r--r-- | miniTamTam/miniTamTamMain.py | 6 |
3 files changed, 10 insertions, 11 deletions
diff --git a/miniTamTam/KeyboardStandAlone.py b/miniTamTam/KeyboardStandAlone.py index ebaf6e2..2a146cf 100644 --- a/miniTamTam/KeyboardStandAlone.py +++ b/miniTamTam/KeyboardStandAlone.py @@ -54,8 +54,8 @@ class KeyboardStandAlone: if GenerationConstants.DRUMPITCH.has_key( pitch ): pitch = GenerationConstants.DRUMPITCH[ pitch ] - if instrument in Config.DRUMKITS: - instrument = Config.DRUMSINSTRUMENTSDICT[Config.DRUMKITS.index(instrument)][ pitch ] + if Config.INSTRUMENTS[instrument].kit != None: + instrument = Config.INSTRUMENTS[instrument].kit[pitch].name pitch = 36 duration = 100 @@ -70,8 +70,7 @@ class KeyboardStandAlone: duration = duration, trackId = track, fullDuration = False, - instrument = instrument, - instrumentFlag = instrument, + instrumentId = Config.INSTRUMENTS[instrument].instrumentId, reverbSend = self.reverb) self.csnd.play(self.key_dict[key], 0.3) #self.key_dict[key].playNow(0.3) @@ -96,7 +95,7 @@ class KeyboardStandAlone: if KEY_MAP_PIANO.has_key(key): csnote = self.key_dict[key] - if Config.INSTRUMENTS[ csnote.instrument].csoundInstrumentId == Config.INST_TIED: + if Config.INSTRUMENTSID[ csnote.instrumentId ].csoundInstrumentId == Config.INST_TIED: csnote.duration = .5 csnote.decay = 0.7 csnote.amplitude = 1 diff --git a/miniTamTam/RythmGenerator.py b/miniTamTam/RythmGenerator.py index 0b3b5dd..ed4c130 100644 --- a/miniTamTam/RythmGenerator.py +++ b/miniTamTam/RythmGenerator.py @@ -42,8 +42,8 @@ def generator( instrument, nbeats, regularity, reverbSend ): def pageGenerate( regularity, drumPitch ): barLength = Config.TICKS_PER_BEAT * nbeats - if instrument in Config.DRUMKITS: - currentInstrument = Config.DRUMSINSTRUMENTSDICT[Config.DRUMKITS.index(instrument)][drumPitch[0]] + if Config.INSTRUMENTS[instrument].kit != None: + currentInstrument = Config.INSTRUMENTS[instrument].kit[drumPitch[0]].name makeRythm = GenRythm( currentInstrument, barLength, nbeats ) @@ -60,7 +60,7 @@ def generator( instrument, nbeats, regularity, reverbSend ): for i in range(len(rythmSequence)): trackNotes.append( CSoundNote( rythmSequence[i], pitchSequence[i], gainSequence[i], pan, durationSequence[i], trackId, - fullDurationSequence[i], instrument, attack, decay, reverbSend ) ) + fullDurationSequence[i], Config.INSTRUMENTS[instrument].instrumentId, attack, decay, reverbSend ) ) return trackNotes ################################################################################## # begin generate() diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py index a985061..3ef8fb5 100644 --- a/miniTamTam/miniTamTamMain.py +++ b/miniTamTam/miniTamTamMain.py @@ -349,8 +349,9 @@ class miniTamTamMain(SubActivity): #data is drum1kit, drum2kit, or drum3kit print 'HANDLE: Generate Button' self.rythmInstrument = data + instrumentId = Config.INSTRUMENTS[data].instrumentId for (o,n) in self.noteList : - self.csnd.loopUpdate(n, NoteDB.PARAMETER.INSTRUMENT, data, -1) + self.csnd.loopUpdate(n, NoteDB.PARAMETER.INSTRUMENT, instrumentId, -1) def handleGenerateBtn(self , widget , data=None): self.regenerate() @@ -375,8 +376,7 @@ class miniTamTamMain(SubActivity): duration = 20, trackId = 1, fullDuration = False, - instrument = instrument, - instrumentFlag = instrument, + instrumentId = Config.INSTRUMENTS[instrument].instrumentId, reverbSend = 0), secs_per_tick) |