@vpmedia/phaser 1.0.13 → 1.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vpmedia/phaser",
-  "version": "1.0.13",
+  "version": "1.0.16",
   "description": "@vpmedia/phaser is the modern ECMAScript port of the popular Phaser game engine v2.6.2",
   "author": "Andras Csizmadia <andras@vpmedia.hu> (www.vpmedia.hu)",
   "license": "MIT",

package/src/phaser/core/sound_manager.js

@@ -80,25 +80,22 @@ export default class {
   }
 
   checkContextState() {
+    // this must be called from the final game state since input.onUp handlers are reset by state manager
     if (this.noAudio) {
-      return false;
-    }
-    if (this.context.state === 'suspended') {
-      this.game.input.onUp.addOnce(this.resumeAudioContext, this);
-      return true;
+      return;
     }
-    return false;
-  }
-
-  resumeAudioContext() {
-    if (this.noAudio) {
+    if (this.game.device.iOS || this.game.device.android) {
+      // touch lock callback already handles context resume
       return;
     }
-    const state = this.context.state;
-    if (state === 'suspended') {
-      this.context.resume().catch((e) => {
-        this.game.exceptionHandler(e, { state });
-      });
+    if (this.context.state === 'suspended') {
+      this.game.input.onUp.addOnce(() => {
+        if (this.context.state === 'suspended') {
+          this.context.resume().catch((e) => {
+            this.game.exceptionHandler(e, { state: this.context.state, reason: 'check' });
+          });
+        }
+      }, this);
     }
   }
 
@@ -117,7 +114,11 @@ export default class {
     } else {
       this._unlockSource.start(0);
     }
-    this.resumeAudioContext();
+    if (this.context.state === 'suspended') {
+      this.context.resume().catch((e) => {
+        this.game.exceptionHandler(e, { state: this.context.state, reason: 'unlock' });
+      });
+    }
     return true;
   }
 
@@ -203,10 +204,14 @@ export default class {
     if (this.touchLocked && this._unlockSource !== null && (this._unlockSource.playbackState === this._unlockSource.PLAYING_STATE || this._unlockSource.playbackState === this._unlockSource.FINISHED_STATE)) {
       this.touchLocked = false;
       this._unlockSource = null;
-      this.resumeAudioContext();
+      if (this.context.state === 'suspended') {
+        this.context.resume().catch((e) => {
+          this.game.exceptionHandler(e, { state: this.context.state, reason: 'update_suspended' });
+        });
+      }
     } else if (this.context.state === 'interrupted') {
       this.context.resume().catch((e) => {
-        this.game.exceptionHandler(e, { state: this.context.state });
+        this.game.exceptionHandler(e, { state: this.context.state, reason: 'update_interrupted' });
       });
     }
     for (let i = 0; i < this._sounds.length; i += 1) {