Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/miniTamTam
diff options
context:
space:
mode:
authoramartin <olpc@localhost.localdomain>2007-03-01 07:06:49 (GMT)
committer amartin <olpc@localhost.localdomain>2007-03-01 07:06:49 (GMT)
commitb048a6c2cf509e5f78bda23c0888abd4d230b626 (patch)
treef26d602941dac42cb96f215b2cf8050b57c05dd1 /miniTamTam
parentf13c4a01e1f26888c4f682a5a3332f226a0de58a (diff)
background loading (instrument panel) and misc bug fixes
Diffstat (limited to 'miniTamTam')
-rw-r--r--miniTamTam/miniTamTamMain.py19
1 files changed, 16 insertions, 3 deletions
diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py
index 694d1eb..a985061 100644
--- a/miniTamTam/miniTamTamMain.py
+++ b/miniTamTam/miniTamTamMain.py
@@ -223,9 +223,18 @@ class miniTamTamMain(SubActivity):
self.rightBox.pack_start(transportBox, True)
def drawInstrumentButtons(self):
- self.instPanel = InstrumentPanel(self.setInstrument,self.playInstrumentNote, False, self.micRec, self.synthRec)
- self.leftBox.pack_start(self.instPanel,True,True)
+ self.instrumentPanelBox = gtk.HBox()
+ # InstrumentPanel(elf.setInstrument,self.playInstrumentNote, False, self.micRec, self.synthRec)
+ self.leftBox.pack_start(self.instrumentPanelBox,True,True)
+ def setInstrumentPanel( self, instrumentPanel ):
+ instrumentPanel.configure( self.setInstrument,self.playInstrumentNote, False, self.micRec, self.synthRec )
+ self.instrumentPanel = instrumentPanel
+ self.instrumentPanelBox.pack_start( instrumentPanel )
+
+ def releaseInstrumentPanel( self ):
+ self.instrumentPanelBox.remove( self.instrumentPanel )
+
def micRec(self,mic):
os.system('rm ' + Config.PREF_DIR + '/' + mic)
if mic == 'mic1':
@@ -390,7 +399,11 @@ class miniTamTamMain(SubActivity):
cleanInstrumentList.sort(lambda g,l: cmp(Config.INSTRUMENTS[g].category, Config.INSTRUMENTS[l].category) )
return cleanInstrumentList + ['drum1kit', 'drum2kit', 'drum3kit']
- def onDestroy( self):
+ def onDeactivate( self ):
+ SubActivity.onDeactivate( self )
+ self.releaseInstrumentPanel()
+
+ def onDestroy( self ):
#this gets called when the whole app is being destroyed
pass