Merge branch 'master' of git+ssh://amartin@dev.laptop.org/git/projects/tamtam

3 files changed, 6 insertions, 5 deletions

diff --git a/miniTamTam/Loop.py b/miniTamTam/Loop.py
index deb1cad..3e9484a 100755
--- a/miniTamTam/Loop.py
+++ b/miniTamTam/Loop.py
@@ -50,10 +50,10 @@ class Loop:
         pitch = i[1]
         gain = i[2]*self.volume
         duration = i[3]
-        if instrument in Instrument.DRUM:
+        if instrument in Instrument.KIT:
             if GenerationConstants.DRUMPITCH.has_key(pitch):
                 pitch = GenerationConstants.DRUMPITCH[pitch]
-            instrument = Instrument.DRUM[ KIT_ELEMENT[pitch] ].name
+            instrument = Instrument.KIT[ Config.KIT_ELEMENT[pitch] ].name
             pitch = 36
         return CSoundNote( onset = onset,
                     pitch = pitch,
diff --git a/miniTamTam/RythmGenerator.py b/miniTamTam/RythmGenerator.py
index 539274c..59c5746 100644
--- a/miniTamTam/RythmGenerator.py
+++ b/miniTamTam/RythmGenerator.py
@@ -4,6 +4,7 @@ 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 ):
 
@@ -44,8 +45,8 @@ def generator( instrument, nbeats, density, regularity, reverbSend ):
     def pageGenerate( regularity, drumPitch ):
         barLength = Config.TICKS_PER_BEAT * nbeats
 
-        if Config.INSTRUMENTS[instrument].kit != None:
-            currentInstrument = Config.INSTRUMENTS[instrument].kit[drumPitch[0]].name
+        print 'pageGenerate drumPitch[0] ', drumPitch[0]
+        currentInstrument = Instrument.KIT[instrument][ Config.KIT_ELEMENT[ 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 258f8e4..7b08217 100644
--- a/miniTamTam/miniTamTamMain.py
+++ b/miniTamTam/miniTamTamMain.py
@@ -597,7 +597,7 @@ class miniTamTamMain(SubActivity):
         #data is drum1kit, drum2kit, or drum3kit
         #print 'HANDLE: Generate Button'
         self.rythmInstrument = data
-        instrumentId = Instrument.INST[data].instrumentId
+        instrumentId = Config.INSTRUMENTS[data].instrumentId
         for (o,n) in self.noteList :
             self.csnd.loopUpdate(n, NoteDB.PARAMETER.INSTRUMENT, instrumentId, -1)
         self.drumFillin.setInstrument( self.rythmInstrument )