HXMusic / HXSound: Fixed issue with enable() retaining enabled/disabled state.

Author: huhx0015

apk/HXAudioPlayer_Demo.apk

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

hxaudio/build.gradle

@@ -19,16 +19,17 @@ public class HXMusic implements HXMusicEngineListener {
 
     /** CLASS VARIABLES ________________________________________________________________________ **/
 
+    // INSTANCE VARIABLES:
+    private static HXMusic hxMusic; // Instance variable for HXMusic.
+
     // AUDIO VARIABLES:
+    private boolean isEnabled = true; // Used to determine if HXMusic has been enabled or disabled.
     private boolean isGapless; // Used to determine if gapless mode has been enabled or not.
     private boolean isLooped; // Used to determine if the current music has looping enabled or not.
     private int musicPosition; // Used for tracking the current music position.
     private HXMusicEngine hxMusicEngine; // Responsible for the control and playback of the MediaPlayer object.
     private HXMusicItem hxMusicItem; // References the current HXMusicItem that stores information about the current music.
-    private HXMusicStatus hxMusicStatus = HXMusicStatus.NOT_READY; // Used to determine the current status of the music.
-
-    // INSTANCE VARIABLES:
-    private static HXMusic hxMusic; // Instance variable for HXMusic.
+    private HXMusicStatus hxMusicStatus = HXMusicStatus.READY; // Used to determine the current status of the music.
 
     // LISTENER VARIABLES:
     private HXMusicListener musicListener; // Interface for listening for events from the MediaPlayer object.
@@ -43,8 +44,7 @@ private enum HXMusicStatus {
         READY,
         PLAYING,
         PAUSED,
-        STOPPED,
-        DISABLED
+        STOPPED
     }
 
     /** INSTANCE METHOD ________________________________________________________________________ **/
@@ -96,7 +96,7 @@ public synchronized void initMusic(HXMusicItem music, int position, boolean isGa
     // specified music can be played or not.
     private boolean checkStatus(HXMusicItem music) {
 
-        if (hxMusicStatus.equals(HXMusicStatus.DISABLED)) {
+        if (!isEnabled) {
             HXLog.e(LOG_TAG, "ERROR: checkStatus(): Music has been currently disabled.");
             return false;
         } else if (music == null) {
@@ -232,12 +232,7 @@ public static void clear() {
     // enable(): Used for enabling and disabling music playback.
     public static void enable(boolean isEnabled) {
         instance();
-
-        if (isEnabled) {
-            hxMusic.hxMusicStatus = HXMusicStatus.READY;
-        } else {
-            hxMusic.hxMusicStatus = HXMusicStatus.DISABLED;
-        }
+        hxMusic.isEnabled = isEnabled;
     }
 
     // getPosition(): Returns the current music position.

hxaudio/src/main/java/com/huhx0015/hxaudio/audio/HXMusic.java

@@ -23,10 +23,9 @@ public class HXSound {
     private static HXSound hxSound; // HXSound instance variable.
 
     // AUDIO VARIABLES:
-    //private boolean isEnabled; // Used for determining if the sound system is enabled or not.
+    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.READY; // Used to determine the current status of the sound system.
     private LinkedList<HXSoundEngine> hxSoundEngines; // LinkedList object which contains the HXSoundEngine instances.
 
     // CONSTANT VARIABLES:
@@ -36,13 +35,6 @@ public class HXSound {
     // LOGGING VARIABLES:
     private static final String LOG_TAG = HXSound.class.getSimpleName();
 
-    /** ENUM ___________________________________________________________________________________ **/
-
-    private enum HXSoundStatus {
-        READY,
-        DISABLED
-    }
-
     /** INSTANCE METHOD ________________________________________________________________________ **/
 
     // instance(): Returns the hxSound instance.
@@ -90,7 +82,6 @@ private void initializeSoundEngines() {
             i++;
         }
 
-        hxSoundStatus = HXSoundStatus.READY;
         HXLog.d(LOG_TAG, "BUILD: All HXSoundEngines are ready.");
     }
 
@@ -126,7 +117,7 @@ public synchronized boolean playSoundFx(int resource, boolean isLooped, Context
             return false;
         }
 
-        if (!hxSoundStatus.equals(HXSoundStatus.DISABLED)) {
+        if (isEnabled) {
 
             if (hxSoundEngines == null) {
                 initializeSoundEngines();
@@ -195,7 +186,7 @@ public static void resumeSounds() {
     // clear(): Releases resources held by this singleton and other objects associated with this
     // object. This method should be called when the singleton object is no longer in use.
     public static void clear() {
-        if (hxSound != null) {
+        if (hxSound != null && hxSound.hxSoundEngines != null) {
             hxSound.release();
             hxSound = null;
         }
@@ -204,12 +195,7 @@ public static void clear() {
     // enable(): Used to enable or disable the HXSound system.
     public static void enable(boolean isEnabled) {
         instance();
-
-        if (isEnabled) {
-            hxSound.hxSoundStatus = HXSoundStatus.READY;
-        } else {
-            hxSound.hxSoundStatus = HXSoundStatus.DISABLED;
-        }
+        hxSound.isEnabled = isEnabled;
     }
 
     // engines(): Specifies the number of sound engine instances to be enabled. This feature is only
@@ -241,15 +227,12 @@ private void release() {
         HXLog.d(LOG_TAG, "RELEASE: release(): Releasing all HXSoundEngine instances...");
 
         // Releases all HXSoundEngine instances.
-        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;
+        int i = 0;
+        for (int x : new int[numberOfEngines]) {
+            hxSoundEngines.get(i).release();
+            HXLog.d(LOG_TAG, "RELEASE: release(): HXSoundEngine (" + i + ") is released.");
+            i++;
         }
-        hxSound = null;
+        hxSoundEngines = null;
     }
 }