diff options
| author | amartin <olpc@xo-00-CE-12.localdomain> | 2007-07-20 21:08:31 (GMT) |
|---|---|---|
| committer | amartin <olpc@xo-00-CE-12.localdomain> | 2007-07-20 21:08:31 (GMT) |
| commit | ca2dfa150f9a76f40025e5ad8a890cafe7910910 (patch) | |
| tree | 27b15b7d460f7a4c70adc2effa2b7e62cd2dae60 /miniTamTam | |
| parent | aab75f49a58c50892472d81561f455efa239b5a5 (diff) | |
| parent | f7c812f92e07f1e676a956bf88cb28f9a77aa0b0 (diff) | |
Merge branch 'master' of git+ssh://amartin@dev.laptop.org/git/projects/tamtam
Diffstat (limited to 'miniTamTam')
| -rw-r--r-- | miniTamTam/MiniSequencer.py | 2 | ||||
| -rw-r--r-- | miniTamTam/miniTamTamMain.py | 21 |
2 files changed, 13 insertions, 10 deletions
diff --git a/miniTamTam/MiniSequencer.py b/miniTamTam/MiniSequencer.py index 797a04c..dceb201 100644 --- a/miniTamTam/MiniSequencer.py +++ b/miniTamTam/MiniSequencer.py @@ -53,7 +53,7 @@ class MiniSequencer: self.startLooking = 1 self.startPlayback() - def clearSequencer( self ): + def clearSequencer( self, widget=None ): for n in self.notesList: self.csnd.loopDelete(n) self.notesList = [] diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py index a464f03..e881fca 100644 --- a/miniTamTam/miniTamTamMain.py +++ b/miniTamTam/miniTamTamMain.py @@ -100,7 +100,7 @@ class miniTamTamMain(SubActivity): self.loopSettingsPopup.set_modal(True) self.loopSettingsPopup.add_events( gtk.gdk.BUTTON_PRESS_MASK ) self.loopSettingsPopup.connect("button-release-event", lambda w,e:self.doneLoopSettingsPopup() ) - self.loopSettings = LoopSettings( self.loopSettingsPopup, self.loopSettingsPlayStop, self.loopSettingsChannel ) + self.loopSettings = LoopSettings( self.loopSettingsPopup, self.loopSettingsPlayStop, self.loopSettingsChannel, self.doneLoopSettingsPopup ) self.loopSettingsPopup.add( self.loopSettings ) @@ -360,6 +360,9 @@ class miniTamTamMain(SubActivity): def doneLoopSettingsPopup(self): if self._recordToolbar.loopSetButton.get_active(): + if self.loopSettings.playStopButton.get_active() == False: + self.loopSettings.playStopButton.set_active(True) + self.loopSettings.handlePlayButton(self.loopSettings.playStopButton) self._recordToolbar.loopSetButton.set_active(False) def handleLoopSettingsBtn(self, widget, data=None): @@ -638,14 +641,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 = Config.INSTRUMENTS[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'), |