X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fsound.py;h=f0ef91c8224c7675050bfb22183b33af9cf20572;hb=HEAD;hp=14ef8d4bac9bc56ff79aa88030ae3d3404691924;hpb=2dc5f787dbb38ebaefbe4c93a0b706c98c2574a9;p=naja.git diff --git a/naja/sound.py b/naja/sound.py index 14ef8d4..f0ef91c 100644 --- a/naja/sound.py +++ b/naja/sound.py @@ -13,9 +13,9 @@ from naja.constants import ( class DummySound(object): def init(self): - pass + self.playing_music = False - def play_sound(self, name, volume=DEFAULT_SOUND_VOLUME): + def play_sound(self, name, volume=DEFAULT_SOUND_VOLUME, foreground=False): pass def play_music(self, name, volume=DEFAULT_MUSIC_VOLUME): @@ -34,6 +34,7 @@ class DummySound(object): class PygameSound(object): def __init__(self): self._sounds = {} + self.playing_music = False def init(self): mixer.init(FREQ, BITSIZE, CHANNELS, BUFFER) @@ -64,21 +65,26 @@ class PygameSound(object): mixer.music.load(track_name) mixer.music.set_volume(volume) mixer.music.play(-1) # loop sound + self.playing_music = True def pause_music(self): mixer.music.pause() + self.playing_music = False def unpause_music(self): mixer.music.unpause() + self.playing_music = True def stop(self): mixer.fadeout(1000) mixer.music.stop() + self.playing_music = False class SoundProxy(object): def __init__(self): self._sound = DummySound() + self._sound.init() def init(self): """Attempt to initialize the sound system."""