diff options
| author | Oli2 <olivier.belanger@umontreal.ca> | 2007-03-19 19:34:15 (GMT) |
|---|---|---|
| committer | Oli2 <olivier.belanger@umontreal.ca> | 2007-03-19 19:34:15 (GMT) |
| commit | fb75c8c382ebd2260a2600c6bfdfc0efefe6449d (patch) | |
| tree | 940726decabf8da1190527dceb5d28f0dd8074a7 /miniTamTam | |
| parent | d03f173fd666c1816d164aa0789f315e76766e95 (diff) | |
| parent | 022ebbf1c6a7f11cf8f7a851cdd4b0834d97d855 (diff) | |
Merge branch 'master' of git+ssh://olipet@dev.laptop.org/git/projects/tamtam
Diffstat (limited to 'miniTamTam')
| -rw-r--r-- | miniTamTam/miniTamTamMain.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py index 82dce2a..b8bf123 100644 --- a/miniTamTam/miniTamTamMain.py +++ b/miniTamTam/miniTamTamMain.py @@ -406,12 +406,19 @@ class miniTamTamMain(SubActivity): cleanInstrumentList.sort(lambda g,l: cmp(Config.INSTRUMENTS[g].category, Config.INSTRUMENTS[l].category) ) return cleanInstrumentList + ['drum1kit', 'drum2kit', 'drum3kit'] + def onActivate( self ): + self.csnd.loopPause() + self.csnd.loopClear() + def onDeactivate( self ): SubActivity.onDeactivate( self ) self.releaseInstrumentPanel() + self.csnd.loopPause() + self.csnd.loopClear() def onDestroy( self ): #this gets called when the whole app is being destroyed + #QUESTION is this called before or after onDeactivate() pass def scale(self, input,input_min,input_max,output_min,output_max): |