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

4 files changed, 33 insertions, 24 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 4b4bda0..4674f2c 100644
--- a/miniTamTam/miniTamTamMain.py
+++ b/miniTamTam/miniTamTamMain.py
@@ -19,6 +19,7 @@ Net = Util.Network # convinience assignment
 
 import Config
 
+from miniTamTam.miniToolbar import miniToolbar
 from Util.ThemeWidgets import *
 from Util.CSoundNote import CSoundNote
 from Util import NoteDB
@@ -36,6 +37,8 @@ from Util.Trackpad import Trackpad
 from Util.InstrumentPanel import InstrumentPanel
 from Util import Instrument
 
+from gettext import gettext as _
+
 Tooltips = Config.Tooltips
 
 from SubActivity import SubActivity
@@ -47,6 +50,7 @@ class miniTamTamMain(SubActivity):
     
         self.activity = activity
 
+
         self.set_border_width(Config.MAIN_WINDOW_PADDING)
 
         self.firstTime = False
@@ -138,6 +142,13 @@ class miniTamTamMain(SubActivity):
             self.syncTimeout = gobject.timeout_add( 1000, self.updateSync )
         #-------------------------------------------------------------------
 
+        # Toolbar
+        self._miniToolbar = miniToolbar(self.activity.toolbox, self)
+        self.activity.activity_toolbar.share.show()
+        self.activity.toolbox.add_toolbar(_('Play'), self._miniToolbar)
+        self._miniToolbar.show()
+
+        self.activity.connect( "shared", self.shared )
        
         if os.path.isfile("FORCE_SHARE"):    # HOST
             r = random.random()
@@ -145,13 +156,13 @@ class miniTamTamMain(SubActivity):
             #self.activity.set_title(_gettext("TTDBG%f" % r))
             print "::::: Sharing as TamTam :::::"
             self.activity.set_title(_gettext("TamTam"))
-            self.activity.connect( "shared", self.shared )
             self.activity.share()
         elif self.activity._shared_activity: # PEER
             self.activity._shared_activity.connect( "buddy-joined", self.buddy_joined )
             self.activity._shared_activity.connect( "buddy-left", self.buddy_left )
             self.activity.connect( "joined", self.joined )
             self.network.setMode( Net.MD_WAIT )
+            #self.activity.activity_toolbar.share.hide()
                 
     def drawSliders( self ):     
         mainLowBox = gtk.HBox()
@@ -586,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 )
diff --git a/miniTamTam/miniToolbar.py b/miniTamTam/miniToolbar.py
index b3805de..717809b 100644
--- a/miniTamTam/miniToolbar.py
+++ b/miniTamTam/miniToolbar.py
@@ -13,6 +13,12 @@ class miniToolbar(gtk.Toolbar):
         gtk.Toolbar.__init__(self)
         self.add_events(gtk.gdk.BUTTON_PRESS_MASK)
         
+        def _insertSeparator():
+            self.separator = gtk.SeparatorToolItem()
+            self.separator.set_draw(True)
+            self.insert(self.separator,-1)
+            self.separator.show()        
+            
         self.toolbox = toolbox
         self.miniTamTam = miniTamTam
         
@@ -30,12 +36,9 @@ class miniToolbar(gtk.Toolbar):
         self.keyboardRecButton.show()
         self.keyboardRecButton.set_tooltip(_('Left click to record, right click to record on top'))
         
-        self.separator = gtk.SeparatorToolItem()
-        self.separator.set_draw(True)
-        self.insert(self.separator,-1)
-        self.insert(self.separator,-1)
-        self.insert(self.separator,-1)
-        self.separator.show()        
+        _insertSeparator()
+        _insertSeparator()
+        _insertSeparator()
         
         self.balanceSliderImgLeft = gtk.Image()
         self.balanceSliderImgRight = gtk.Image()
@@ -64,11 +67,8 @@ class miniToolbar(gtk.Toolbar):
         self.balanceSliderTool.show()
         self.balanceSliderTool.set_tooltip(self.tooltips, _('Balance'))
         
-        self.separator = gtk.SeparatorToolItem()
-        self.separator.set_draw(True)
-        self.insert(self.separator,-1)
-        self.insert(self.separator,-1)
-        self.separator.show()
+        _insertSeparator()
+        _insertSeparator()
         
         self.reverbSliderImgRight = gtk.Image()
         self.reverbSliderImgRight.set_from_file(Config.IMAGE_ROOT + 'reverb0.png')
@@ -91,12 +91,9 @@ class miniToolbar(gtk.Toolbar):
         self.reverbSliderTool.show()
         self.reverbSliderTool.set_tooltip(self.tooltips, _('Reverb'))
         
-        self.separator = gtk.SeparatorToolItem()
-        self.separator.set_draw(True)
-        self.insert(self.separator,-1)
-        self.insert(self.separator,-1)
-        self.insert(self.separator,-1)
-        self.separator.show()
+        _insertSeparator()
+        _insertSeparator()
+        _insertSeparator()
         
         self.micRec1Button = ToolButton('micrec1')
         self.micRec1Button.connect('clicked',self.miniTamTam.micRec,'mic1')
@@ -121,4 +118,4 @@ class miniToolbar(gtk.Toolbar):
         self.insert(self.micRec4Button, -1)
         self.micRec4Button.show()
         self.micRec4Button.set_tooltip(('Record microphone into slot 4'))           
-    
\ No newline at end of file
+