android/pygame mixer: fix Sound.stop() method (wasnt working at all), and avoid multiple play when multiple call play() are done (same behavior as pygame mixer)

tito · tito · commit 83efd49472c0 · 2012-09-30T02:36:50.000+02:00
diff --git a/recipes/android/src/android_mixer.py b/recipes/android/src/android_mixer.py
@@ -139,12 +139,13 @@ def get_busy(self):
         return sound.busy(self.id)
 
     def get_sound(self):
-        rv = sound.busy(self.id)
-        if rv is not None:
-            rv = sounds.get(rv, None)
-
-        return rv
-
+        is_busy = sound.busy(self.id)
+        if not is_busy:
+            return
+        serial = sound.playing_name(self.id)
+        if not serial:
+            return
+        return sounds.get(serial, None)
 
     def queue(self, s):
         self.loop = None
@@ -183,6 +184,7 @@ def __init__(self, what):
 
         global sound_serial
 
+        self._channel = None
         self.serial = str(sound_serial)
         sound_serial += 1
 
@@ -194,7 +196,12 @@ def __init__(self, what):
         sounds[self.serial] = self
 
     def play(self, loops=0, maxtime=0, fade_ms=0):
-        channel = find_channel(True)
+        # avoid new play if the sound is already playing
+        # -> same behavior as standard pygame.
+        if self._channel is not None:
+            if self._channel.get_sound() is self:
+                return
+        self._channel = channel = find_channel(True)
         channel.play(self, loops=loops)
         return channel
 
