From 104042471f8a30a2b89cef43b77df99a42c3233d Mon Sep 17 00:00:00 2001
From: Collin Smith <collinsmith70@gmail.com>
Date: Sun, 20 Oct 2019 22:53:54 -0700
Subject: [PATCH] Fixed issue on android where audio doesn't play on the same
 frame it's loaded

Fixed issue on android where audio doesn't play on the same frame it's loaded
SFX audio that doesn't play will remain deferred until subsequent frame
Small optimization with audio instance creation
---
 core/src/com/riiablo/audio/Audio.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/core/src/com/riiablo/audio/Audio.java b/core/src/com/riiablo/audio/Audio.java
index 02788152..26d47cd0 100644
--- a/core/src/com/riiablo/audio/Audio.java
+++ b/core/src/com/riiablo/audio/Audio.java
@@ -41,8 +41,8 @@ public class Audio {
       Instance instance = it.next();
       if (assets.isLoaded(instance.descriptor)) {
         instance.delegate = assets.get(instance.descriptor);
-        instance.play();
-        it.remove();
+        boolean played = instance.play();
+        if (played) it.remove();
       }
     }
   }
@@ -87,12 +87,11 @@ public class Audio {
         // FIXME: sounds do not play on their current frame on Android, play next frame
         final Sound sfx = assets.get(descriptor);
         long id = sfx.play(sound.Volume / 255f);
+        Instance instance = Instance.obtain(descriptor, sfx, id);
         if (id == -1) {
-          Instance instance = Instance.obtain(descriptor, sfx, id);
           deferred.add(instance);
-          return instance;
         }
-        return Instance.obtain(descriptor, sfx, id);
+        return instance;
       } else {
         Instance instance = Instance.obtain(descriptor, null, -1);
         deferred.add(instance);
@@ -123,11 +122,13 @@ public class Audio {
       id = -1;
     }
 
-    public void play() {
+    public boolean play() {
       if (stream) {
         ((Music) delegate).play();
+        return true;
       } else {
         id = ((Sound) delegate).play();
+        return id != -1;
       }
     }