diff options
author | Aleksey Lim <alsroot@member.fsf.org> | 2009-03-28 21:45:36 (GMT) |
---|---|---|
committer | Aleksey Lim <alsroot@member.fsf.org> | 2009-03-28 21:45:36 (GMT) |
commit | 5cac29362eb238311f279a016ec2a77221d26022 (patch) | |
tree | a1f546f3b696b2147101730334ce56718b536351 /activity.py | |
parent | 14dc6102b74694bdeba6e69f7bc1b83c25d1f151 (diff) | |
parent | ef484729615ceff32b408c0e8b5c36d35ba32575 (diff) |
Merge branch 'gstreamer'v30
Diffstat (limited to 'activity.py')
-rw-r--r-- | activity.py | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/activity.py b/activity.py index 3b1d816..aba9d9b 100644 --- a/activity.py +++ b/activity.py @@ -188,9 +188,9 @@ class MemorizeActivity(Activity): if self.play_mode == False: self.hbox.remove(self.createcardpanel) self.hbox.remove(self.cardlist) - - self.hbox.pack_start(self.scoreboard) - self.hbox.pack_start(self.table, False) + if self.play_mode in (False, None): + self.hbox.pack_start(self.scoreboard) + self.hbox.pack_start(self.table, False) self.play_mode = True def restart(self, widget): @@ -299,17 +299,11 @@ class MemorizeActivity(Activity): self.game.rem_buddy(buddy) def _focus_in(self, event, data=None): - if self.game.sound == 1: - self.game.cs.start() - _logger.debug(" Memorize is visible: start csound server. ") + self.game.audio.play() def _focus_out(self, event, data=None): - if self.game.sound == 1: - self.game.cs.pause() - _logger.debug(" Memorize is invisible: pause csound server. ") + self.game.audio.pause() def _cleanup_cb(self, data=None): - if self.game.sound == 1: - self.game.cs.quit() - _logger.debug(" Memorize closes: close csound server. ") + self.game.audio.stop() |