diff options
author | Oli <olivier.belanger@umontreal.ca> | 2007-07-20 23:32:02 (GMT) |
---|---|---|
committer | Oli <olivier.belanger@umontreal.ca> | 2007-07-20 23:32:02 (GMT) |
commit | bd4e4e6811256ea2983791a9073f677f826633c4 (patch) | |
tree | e5d93a406355f9c33f487ec934558fe8097560b0 /miniTamTam | |
parent | 88cd0106879984d484bdb711dfe2e1f9616beebf (diff) | |
parent | 6784621507a8c7786e731b984ab57a7b8c3da400 (diff) |
Merge branch 'master' of git+ssh://olipet@dev.laptop.org/git/projects/tamtam
Conflicts:
miniTamTam/KeyboardStandAlone.py
Diffstat (limited to 'miniTamTam')
-rw-r--r-- | miniTamTam/GenRythm.py | 10 | ||||
-rw-r--r-- | miniTamTam/KeyboardStandAlone.py | 15 | ||||
-rwxr-xr-x | miniTamTam/Loop.py | 7 | ||||
-rw-r--r-- | miniTamTam/RythmGenerator.py | 3 | ||||
-rw-r--r-- | miniTamTam/miniTamTamMain.py | 17 |
5 files changed, 24 insertions, 28 deletions
diff --git a/miniTamTam/GenRythm.py b/miniTamTam/GenRythm.py index a9d8f70..d0e23e3 100644 --- a/miniTamTam/GenRythm.py +++ b/miniTamTam/GenRythm.py @@ -4,8 +4,6 @@ import Config from Generation.GenerationConstants import GenerationConstants from Generation.Utils import * -from Util import Instrument - class GenRythm: def drumRythmSequence(self, instrumentName, nbeats, density, regularity ): rythmSequence = [] @@ -16,28 +14,28 @@ class GenRythm: countDown = 0 onsetTime = None - if Instrument.INST[instrumentName].register == 'punch': + if Config.INSTRUMENTS[instrumentName].instrumentRegister == Config.PUNCH: registerDensity = 0.5 downBeatRecurence = 4 downBeats = [x for x in GenerationConstants.DRUM_PUNCH_ACCENTS[ nbeats ]] for downBeat in downBeats: upBeats.append( downBeat + Config.TICKS_PER_BEAT / 2 ) - if Instrument.INST[instrumentName].register == 'low': + if Config.INSTRUMENTS[instrumentName].instrumentRegister == Config.LOW: registerDensity =1 downBeatRecurence = 4 downBeats = [x for x in GenerationConstants.DRUM_LOW_ACCENTS[ nbeats ]] for downBeat in downBeats: upBeats.append( downBeat + Config.TICKS_PER_BEAT / 2 ) - if Instrument.INST[instrumentName].register == 'mid': + if Config.INSTRUMENTS[instrumentName].instrumentRegister == Config.MID: registerDensity = .75 downBeatRecurence = 1 downBeats = [x for x in GenerationConstants.DRUM_MID_ACCENTS[ nbeats ]] for downBeat in downBeats: upBeats.append( downBeat + Config.TICKS_PER_BEAT / 4 ) - if Instrument.INST[instrumentName].register == 'high': + if Config.INSTRUMENTS[instrumentName].instrumentRegister == Config.HIGH: registerDensity = 1.5 downBeatRecurence = 1 downBeats = [x for x in GenerationConstants.DRUM_HIGH_ACCENTS[ nbeats ]] diff --git a/miniTamTam/KeyboardStandAlone.py b/miniTamTam/KeyboardStandAlone.py index a420a80..1560023 100644 --- a/miniTamTam/KeyboardStandAlone.py +++ b/miniTamTam/KeyboardStandAlone.py @@ -7,7 +7,6 @@ from Generation.GenerationConstants import GenerationConstants from Util.NoteDB import Note from Util.CSoundNote import CSoundNote from Util.CSoundClient import new_csound_client -from Util import Instrument KEY_MAP_PIANO = Config.KEY_MAP_PIANO @@ -94,16 +93,18 @@ class KeyboardStandAlone: #print >>log, 'instrumentName:', instrumentName pitch = KEY_MAP_PIANO[key] - if instrumentName in Instrument.KIT: - #print >>log, 'kit_element: ', Config.KIT_ELEMENT[pitch] - playkey(36,100, Instrument.KIT[instrumentName][ Config.KIT_ELEMENT[pitch] ] ) + if None != Config.INSTRUMENTS[instrumentName].kit: + if pitch in GenerationConstants.DRUMPITCH: + pitch = GenerationConstants.DRUMPITCH[pitch] + #print >>log, 'kit_element: ', Config.KIT_ELEMENT[pitch] + playkey(36,100, Config.INSTRUMENTS[instrumentName].kit[pitch]) else: if event.state == gtk.gdk.MOD1_MASK: pitch += 5 - instrument = Instrument.INST[ instrumentName ] - if instrument.csoundInstrumentName == 'inst_perc': #Percussions resonance + instrument = Config.INSTRUMENTS[ instrumentName ] + if instrument.csoundInstrumentId == Config.INST_PERC: #Percussions resonance playkey( pitch, 60, instrument) else: playkey( pitch, -1, instrument) @@ -123,7 +124,7 @@ class KeyboardStandAlone: if KEY_MAP_PIANO.has_key(key): csnote = self.key_dict[key] - if Instrument.INST_byId[ csnote.instrumentId ].csoundInstrumentName == '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/Loop.py b/miniTamTam/Loop.py index 3e9484a..2a66626 100755 --- a/miniTamTam/Loop.py +++ b/miniTamTam/Loop.py @@ -6,7 +6,6 @@ from Util.CSoundNote import CSoundNote from Util.CSoundClient import new_csound_client from Util.NoteDB import Note from Util.NoteDB import PARAMETER -from Util import Instrument from Generation.GenerationConstants import GenerationConstants class Loop: @@ -50,10 +49,10 @@ class Loop: pitch = i[1] gain = i[2]*self.volume duration = i[3] - if instrument in Instrument.KIT: + if Config.INSTRUMENTS[instrument].kit != None: if GenerationConstants.DRUMPITCH.has_key(pitch): pitch = GenerationConstants.DRUMPITCH[pitch] - instrument = Instrument.KIT[ Config.KIT_ELEMENT[pitch] ].name + instrument = Config.INSTRUMENTS[ instrument ].kit[pitch].name pitch = 36 return CSoundNote( onset = onset, pitch = pitch, @@ -61,7 +60,7 @@ class Loop: pan = 0.5, duration = duration, trackId = 0, - instrumentId = Instrument.INST[instrument].instrumentId, + instrumentId = Config.INSTRUMENTS[instrument].instrumentId, reverbSend = reverb, tied = False, mode = 'mini') diff --git a/miniTamTam/RythmGenerator.py b/miniTamTam/RythmGenerator.py index 70d9720..4740160 100644 --- a/miniTamTam/RythmGenerator.py +++ b/miniTamTam/RythmGenerator.py @@ -4,7 +4,6 @@ import Config from Util.CSoundNote import CSoundNote from Generation.GenerationConstants import GenerationConstants from GenRythm import GenRythm -from Util import Instrument def generator( instrument, nbeats, density, regularity, reverbSend ): @@ -46,7 +45,7 @@ def generator( instrument, nbeats, density, regularity, reverbSend ): barLength = Config.TICKS_PER_BEAT * nbeats #print 'pageGenerate drumPitch[0] ', drumPitch[0] - currentInstrument = Instrument.KIT[instrument][ Config.KIT_ELEMENT[ drumPitch[0] ]].name + currentInstrument = Config.INSTRUMENTS[ instrument ].kit[ drumPitch[0] ].name rythmSequence = makeRythm.drumRythmSequence(currentInstrument, nbeats, density, regularity) pitchSequence = makePitchSequence(len(rythmSequence), drumPitch ) diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py index 7121fa4..331291a 100644 --- a/miniTamTam/miniTamTamMain.py +++ b/miniTamTam/miniTamTamMain.py @@ -36,7 +36,6 @@ from RythmGenerator import * from SynthLab.SynthLabWindow import SynthLabWindow from Util.Trackpad import Trackpad from Util.InstrumentPanel import InstrumentPanel -from Util import Instrument from gettext import gettext as _ @@ -641,14 +640,14 @@ class miniTamTamMain(SubActivity): def playInstrumentNote(self , instrument, secs_per_tick = 0.025): if not self.muteInst: - self.csnd.play( - CSoundNote( onset = 0, - pitch = 36, - amplitude = 1, - pan = 0.5, - duration = 20, - trackId = 1, - instrumentId = Instrument.INST[instrument].instrumentId, + self.csnd.play( + CSoundNote( onset = 0, + pitch = 36, + amplitude = 1, + pan = 0.5, + duration = 20, + trackId = 1, + instrumentId = Config.INSTRUMENTS[instrument].instrumentId, reverbSend = 0, tied = False, mode = 'mini'), |