Android: Fix issue with AndroidHarness trying to pause audio after app.stop() closed down the audio renderer

iwgeric · iwgeric · commit a1316b4514df · 2013-07-17T02:25:13.000Z
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10728 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
diff --git a/engine/src/android/com/jme3/audio/android/AndroidOpenALSoftAudioRenderer.java b/engine/src/android/com/jme3/audio/android/AndroidOpenALSoftAudioRenderer.java
@@ -71,6 +71,7 @@ public class AndroidOpenALSoftAudioRenderer implements AndroidAudioRenderer, Run
     private static final float UPDATE_RATE = 0.05f;
     private final Thread audioThread = new Thread(this, "jME3 Audio Thread");
     private final AtomicBoolean threadLock = new AtomicBoolean(false);
+    private boolean initialized = false;
 
     public AndroidOpenALSoftAudioRenderer() {
     }
@@ -98,6 +99,8 @@ public void run() {
             threadLock.notifyAll();
         }
 
+        initialized = true;
+
         long updateRateNanos = (long) (UPDATE_RATE * 1000000000);
         mainloop:
         while (true) {
@@ -126,6 +129,8 @@ public void run() {
             }
         }
 
+        initialized = false;
+
         synchronized (threadLock) {
             cleanupInThread();
         }
@@ -1292,6 +1297,12 @@ public void deleteAudioData(AudioData ad) {
     }
 
     public void pauseAll() {
+        // don't try to pause all audio (mainly from Android activity) if
+        //   the renderer is already closed down
+        if (!initialized) {
+            return;
+        }
+
         checkDead();
         synchronized (threadLock) {
             while (!threadLock.get()) {

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ public class AndroidOpenALSoftAudioRenderer implements AndroidAudioRenderer, Run`
`71`	`71`	`private static final float UPDATE_RATE = 0.05f;`
`72`	`72`	`private final Thread audioThread = new Thread(this, "jME3 Audio Thread");`
`73`	`73`	`private final AtomicBoolean threadLock = new AtomicBoolean(false);`
	`74`	`+ private boolean initialized = false;`
`74`	`75`
`75`	`76`	`public AndroidOpenALSoftAudioRenderer() {`
`76`	`77`	`}`
`@@ -98,6 +99,8 @@ public void run() {`
`98`	`99`	`threadLock.notifyAll();`
`99`	`100`	`}`
`100`	`101`
	`102`	`+ initialized = true;`
	`103`	`+`
`101`	`104`	`long updateRateNanos = (long) (UPDATE_RATE * 1000000000);`
`102`	`105`	`mainloop:`
`103`	`106`	`while (true) {`
`@@ -126,6 +129,8 @@ public void run() {`
`126`	`129`	`}`
`127`	`130`	`}`
`128`	`131`
	`132`	`+ initialized = false;`
	`133`	`+`
`129`	`134`	`synchronized (threadLock) {`
`130`	`135`	`cleanupInThread();`
`131`	`136`	`}`
`@@ -1292,6 +1297,12 @@ public void deleteAudioData(AudioData ad) {`
`1292`	`1297`	`}`
`1293`	`1298`
`1294`	`1299`	`public void pauseAll() {`
	`1300`	`+ // don't try to pause all audio (mainly from Android activity) if`
	`1301`	`+ // the renderer is already closed down`
	`1302`	`+ if (!initialized) {`
	`1303`	`+ return;`
	`1304`	`+ }`
	`1305`	`+`
`1295`	`1306`	`checkDead();`
`1296`	`1307`	`synchronized (threadLock) {`
`1297`	`1308`	`while (!threadLock.get()) {`