HXSound: Fixed null pointer issue when releasing audio.

Author: huhx0015

apk/HXAudioPlayer_Demo.apk

@@ -78,15 +78,24 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />

app/app.iml

@@ -8,7 +8,7 @@ android {
         minSdkVersion 9
         targetSdkVersion 25
         versionCode 1
-        versionName "3.1.2"
+        versionName "3.1.3"
     }
     buildTypes {
         release {

hxaudio/build.gradle

@@ -26,7 +26,7 @@ public class HXSound {
     //private boolean isEnabled; // Used for determining if the sound system is enabled or not.
     private int currentEngine; // Used for determining the active HXSoundEngine instance.
     private int numberOfEngines; // Used for determining the number of HXSoundEngine instances.
-    private HXSoundStatus hxSoundStatus = HXSoundStatus.NOT_READY; // Used to determine the current status of the sound system.
+    private HXSoundStatus hxSoundStatus = HXSoundStatus.READY; // Used to determine the current status of the sound system.
     private LinkedList<HXSoundEngine> hxSoundEngines; // LinkedList object which contains the HXSoundEngine instances.
 
     // CONSTANT VARIABLES:
@@ -39,9 +39,7 @@ public class HXSound {
     /** ENUM ___________________________________________________________________________________ **/
 
     private enum HXSoundStatus {
-        NOT_READY,
         READY,
-        RELEASED,
         DISABLED
     }
 
@@ -128,12 +126,12 @@ public synchronized boolean playSoundFx(int resource, boolean isLooped, Context
             return false;
         }
 
-        if (hxSoundStatus.equals(HXSoundStatus.NOT_READY) || hxSoundStatus.equals(HXSoundStatus.RELEASED)) {
-            initializeSoundEngines();
-        }
-
         if (!hxSoundStatus.equals(HXSoundStatus.DISABLED)) {
 
+            if (hxSoundEngines == null) {
+                initializeSoundEngines();
+            }
+
             HXLog.d(LOG_TAG, "SOUND: Attempting to play sound effect on HXSoundEngine (" + currentEngine + ")...");
             hxSoundEngines.get(currentEngine).prepareSoundFx(resource, isLooped, context);
 
@@ -243,14 +241,15 @@ private void release() {
         HXLog.d(LOG_TAG, "RELEASE: release(): Releasing all HXSoundEngine instances...");
 
         // Releases all HXSoundEngine instances.
-        int i = 0;
-        for (int x : new int[numberOfEngines]) {
-            hxSoundEngines.get(i).release();
-            HXLog.d(LOG_TAG, "RELEASE: release(): HXSoundEngine (" + i + ") is released.");
-            i++;
+        if (hxSoundEngines != null) {
+            int i = 0;
+            for (int x : new int[numberOfEngines]) {
+                hxSoundEngines.get(i).release();
+                HXLog.d(LOG_TAG, "RELEASE: release(): HXSoundEngine (" + i + ") is released.");
+                i++;
+            }
+            hxSoundEngines = null;
         }
-
-        hxSoundEngines = null;
-        hxSoundStatus = HXSoundStatus.RELEASED;
+        hxSound = null;
     }
 }