diff options
author | Aleksey Lim <alsroot@member.fsf.org> | 2009-02-17 23:34:37 (GMT) |
---|---|---|
committer | Aleksey Lim <alsroot@member.fsf.org> | 2009-02-17 23:34:37 (GMT) |
commit | 256d8dfd85821aaa810c5aabbcb0076cd8e6a4fe (patch) | |
tree | 40ec58d70318d4a31e0a8da68d1c2ca8e9e8510f | |
parent | 89aa01f23e3f89c0d72d4e6d7d82b9c656e1ff30 (diff) |
Remove redundant audio checks
-rw-r--r-- | activity.py | 9 | ||||
-rw-r--r-- | game.py | 23 |
2 files changed, 8 insertions, 24 deletions
diff --git a/activity.py b/activity.py index 38b4270..aba9d9b 100644 --- a/activity.py +++ b/activity.py @@ -299,14 +299,11 @@ class MemorizeActivity(Activity): self.game.rem_buddy(buddy) def _focus_in(self, event, data=None): - if self.game.sound == 1: - self.game.audio.play() + self.game.audio.play() def _focus_out(self, event, data=None): - if self.game.sound == 1: - self.game.audio.pause() + self.game.audio.pause() def _cleanup_cb(self, data=None): - if self.game.sound == 1: - self.game.audio.stop() + self.game.audio.stop() @@ -75,18 +75,7 @@ class MemorizeGame(GObject): self.flip_block = False self._flop_cards = None - # create csound instance to play sound files - self.sound = 0 - try: - import csnd - del csnd - self.sound = 1 - _logger.error(' [Check for module csnd] found.') - except: - _logger.error(' [Check for module csnd] not found. There will be no sound.') - - if self.sound == 1: - self.audio = Audio() + self.audio = Audio() def load_game(self, game_name, size, mode): self.set_load_mode('Loading game') @@ -201,12 +190,10 @@ class MemorizeGame(GObject): self.model.data['running'] = 'True' - # play sound in case if available - if self.sound == 1: - snd = self.model.grid[id].get('snd', None) - if snd != None: - sound_file = join(self.model.data.get('pathsnd'), snd) - self.audio.play(sound_file) + snd = self.model.grid[id].get('snd', None) + if snd != None: + sound_file = join(self.model.data.get('pathsnd'), snd) + self.audio.play(sound_file) self.emit('flip-card', id) if not signal: |