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

3 files changed, 48 insertions, 21 deletions

diff --git a/miniTamTam/MiniSequencer.py b/miniTamTam/MiniSequencer.py
index 887b4cf..4182af9 100644
--- a/miniTamTam/MiniSequencer.py
+++ b/miniTamTam/MiniSequencer.py
@@ -33,13 +33,13 @@ class MiniSequencer:
         gobject.source_remove( self.playBackTimeout )
         self.playState = 0
 
-    def handleRecordButton( self, widget, event ):
+    def handleRecordButton( self, widget, data ):
         if not self.startLooking:
             if 1: #widget.get_active() == True:
                 self.beats = [i*4 for i in range(self.beat)]
                 self.upBeats = [i+2 for i in self.beats]
                 self.realTick = [i for i in range(self.beat*4)]
-                if event.button == 1:
+                if data:
                     self.clearSequencer()
                 self.startLooking = 1
                 self.startPlayback()
diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py
index aba34c8..7640f32 100644
--- a/miniTamTam/miniTamTamMain.py
+++ b/miniTamTam/miniTamTamMain.py
@@ -351,11 +351,15 @@ class miniTamTamMain(SubActivity):
     def loopSettingsChannel(self, channel, value):
         self.csnd.setChannel(channel, value)
     
-    def loopSettingsPlayStop(self, state):
+    def loopSettingsPlayStop(self, state, loop):
         if not state:
-            self.csnd.inputMessage(Config.CSOUND_PLAY_LS_NOTE)
+            if loop:
+                self.csnd.inputMessage(Config.CSOUND_PLAY_LS_NOTE % 5022)
+            else:
+                self.csnd.inputMessage(Config.CSOUND_PLAY_LS_NOTE % 5023)                
         else:
-            self.csnd.inputMessage(Config.CSOUND_STOP_LS_NOTE)
+            if loop:
+                self.csnd.inputMessage(Config.CSOUND_STOP_LS_NOTE)
             
     def doneLoopSettingsPopup(self):
         if self.loopSettingsBtn.get_active():
@@ -381,8 +385,12 @@ class miniTamTamMain(SubActivity):
                 except IOError: 
                     print 'ERROR: failed to load Sound from file %s' % chooser.get_filename()
             chooser.destroy()
-
-            self.loopSettings.set_name(soundName)
+            results = commands.getstatusoutput("csound -U sndinfo %s" % tempName)
+            if results[0] == 0:
+                list = results[1].split()
+                pos = list.index('seconds')
+                soundLength = float(list[pos-1])
+            self.loopSettings.set_values(soundName, soundLength)
             self.loopSettingsPopup.show()
             self.loopSettingsPopup.move( 600, 200 )
             self.timeoutLoad = gobject.timeout_add(1000, self.load_ls_instrument, soundName)
@@ -415,6 +423,7 @@ class miniTamTamMain(SubActivity):
         (s4, o4) = commands.getstatusoutput("rm " + Config.PREF_DIR + "/tempMic.wav") 
         self.micTimeout = gobject.timeout_add(200, self.loadMicInstrument, mic)
         self.instrumentPanel.set_activeInstrument(mic,True)
+        self.setInstrument(mic)
         
     def synthRec(self,lab):
         if self.synthLabWindow != None:
@@ -570,7 +579,7 @@ class miniTamTamMain(SubActivity):
         self.reverb = adj.value
         self.drumFillin.setReverb( self.reverb )
         img = int(self.scale(self.reverb,0,1,0,4))
-        self.activity._playToolbar.reverbSliderImgRight.set_from_file(Config.IMAGE_ROOT + 'reverb' + str(img) + '.png')
+        self._playToolbar.reverbSliderImgRight.set_from_file(Config.IMAGE_ROOT + 'reverb' + str(img) + '.png')
         self.keyboardStandAlone.setReverb(self.reverb)
 
     def handleVolumeSlider(self, adj):
diff --git a/miniTamTam/miniToolbars.py b/miniTamTam/miniToolbars.py
index 02b93b1..36440f6 100644
--- a/miniTamTam/miniToolbars.py
+++ b/miniTamTam/miniToolbars.py
@@ -63,7 +63,7 @@ class playToolbar(gtk.Toolbar):
         _insertSeparator()
         
         self.reverbSliderImgRight = gtk.Image()
-        self.reverbSliderImgRight.set_from_file(Config.IMAGE_ROOT + 'reverb0.png')
+        self.reverbSliderImgRight.set_from_file(Config.IMAGE_ROOT + 'dur2.png')
         self.reverbSliderImgRightTool = gtk.ToolItem()
         self.reverbSliderImgRightTool.add(self.reverbSliderImgRight)
 
@@ -96,33 +96,51 @@ class recordToolbar(gtk.Toolbar):
     
         self.toolbox = toolbox
         self.miniTamTam = miniTamTam
-        
-        self.keyboardRecButton = ToggleToolButton('keyrec')
-        self.keyboardRecButton.connect('button-press-event', self.miniTamTam.sequencer.handleRecordButton)
-        self.insert(self.keyboardRecButton, -1)
-        self.keyboardRecButton.show()
-        self.keyboardRecButton.set_tooltip(_('Left click to record, right click to record on top'))
-        
-        self.micRec1Button = ToolButton('micrec1')
+                 
+        self.micRec1Button = ToolButton('rec1')
         self.micRec1Button.connect('clicked',self.miniTamTam.micRec,'mic1')
         self.insert(self.micRec1Button, -1)
         self.micRec1Button.show()
         self.micRec1Button.set_tooltip(_('Record microphone into slot 1'))
         
-        self.micRec2Button = ToolButton('micrec2')
+        self.micRec2Button = ToolButton('rec2')
         self.micRec2Button.connect('clicked',self.miniTamTam.micRec,'mic2')
         self.insert(self.micRec2Button, -1)
         self.micRec2Button.show()
         self.micRec2Button.set_tooltip(_('Record microphone into slot 2'))
         
-        self.micRec3Button = ToolButton('micrec3')
+        self.micRec3Button = ToolButton('rec3')
         self.micRec3Button.connect('clicked',self.miniTamTam.micRec,'mic3')
         self.insert(self.micRec3Button, -1)
         self.micRec3Button.show()
         self.micRec3Button.set_tooltip(_('Record microphone into slot 3'))
         
-        self.micRec4Button = ToolButton('micrec4')
+        self.micRec4Button = ToolButton('rec4')
         self.micRec4Button.connect('clicked',self.miniTamTam.micRec,'mic4')
         self.insert(self.micRec4Button, -1)
         self.micRec4Button.show()
-        self.micRec4Button.set_tooltip(('Record microphone into slot 4'))    
\ No newline at end of file
+        self.micRec4Button.set_tooltip(('Record microphone into slot 4'))
+        
+        _insertSeparator()
+        _insertSeparator()
+        
+        self.keyboardRecButton = ToggleToolButton('keyrec')
+        self.keyboardRecButton.connect('clicked', self.miniTamTam.sequencer.handleRecordButton, True)
+        self.insert(self.keyboardRecButton, -1)
+        self.keyboardRecButton.show()
+        self.keyboardRecButton.set_tooltip(_('Click to record a loop'))
+        
+        self.keyboardRecOverButton = ToggleToolButton('overrec')
+        self.keyboardRecOverButton.connect('clicked', self.miniTamTam.sequencer.handleRecordButton, False)
+        self.insert(self.keyboardRecOverButton, -1)
+        self.keyboardRecOverButton.show()
+        self.keyboardRecOverButton.set_tooltip(_('Click to add a loop'))
+        
+        _insertSeparator()
+        _insertSeparator()
+        
+        self.loopSetButton = ToggleToolButton('loop')
+        #self.loopSetButton.connect('clicked', self.miniTamTam.changeme)
+        self.insert(self.loopSetButton, -1)
+        self.loopSetButton.show()
+        self.loopSetButton.set_tooltip(_('Add new sound'))
\ No newline at end of file