update drums in edit fix, clear loop on miniT 'close', always regenerate when opening miniT

2 files changed, 15 insertions, 9 deletions

diff --git a/miniTamTam/MiniSequencer.py b/miniTamTam/MiniSequencer.py
index 31650d7..1e40aac 100644
--- a/miniTamTam/MiniSequencer.py
+++ b/miniTamTam/MiniSequencer.py
@@ -24,7 +24,7 @@ class MiniSequencer:
         self.recordButtonState = recordButtonState
         self.playbackTimeout = None
         self.playState = 0
-
+            
     def setTempo( self, tempo ):
         self.tempo = tempo
         self.tickDuration = 60. / self.tempo / 12.
@@ -38,12 +38,15 @@ class MiniSequencer:
                 self.upBeats = [i+2 for i in self.beats]
                 self.realTick = [i for i in range(self.beat*4)]
                 if event.button == 1:
-                    for n in self.notesList:
-                        self.csnd.loopDelete(n)
-                    self.notesList = []
+                    self.clearSequencer()
                 self.startLooking = 1
                 self.startPlayback()
 
+    def clearSequencer( self ):
+        for n in self.notesList:
+            self.csnd.loopDelete(n)
+            self.notesList = []
+
     def getPlayState( self ):
         return self.playState
 
diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py
index 6b4afab..9bde947 100644
--- a/miniTamTam/miniTamTamMain.py
+++ b/miniTamTam/miniTamTamMain.py
@@ -31,19 +31,18 @@ class miniTamTamMain(SubActivity):
     def __init__(self, set_mode):
         SubActivity.__init__(self, set_mode)
         self.set_border_width(Config.MAIN_WINDOW_PADDING)
-        
-        self.csnd = new_csound_client()
 
-        self.instrument = 'ocarina'
+        self.csnd = new_csound_client()
         self.timeout_ms = 50
-        self.reverb = 0.
         self.volume = 80
+        self.instrument = 'ocarina'
         self.regularity = 0.75
         self.beat = 4
+        self.reverb = 0.
         self.tempo = Config.PLAYER_TEMPO
         self.rythmInstrument = 'drum1kit'
-        self.sequencer= MiniSequencer(self.recordStateButton)
         self.regenerate()
+        self.sequencer= MiniSequencer(self.recordStateButton)
         self.csnd.loopSetTempo(self.tempo)
         self.noteList = []
         time.sleep(0.001)
@@ -280,6 +279,10 @@ class miniTamTamMain(SubActivity):
         self.csnd.loopSetNumTicks( self.beat * Config.TICKS_PER_BEAT)
         
     def handleClose(self,widget):
+        if self.playStopButton.get_active() == True:
+            self.playStopButton.set_active(False)  
+        self.sequencer.clearSequencer()
+        self.csnd.loopClear()
         self.set_mode('welcome')
                
     def handleGenerationSlider(self, adj):