@vpmedia/phaser 1.0.6 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vpmedia/phaser",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "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/cache.js

@@ -137,7 +137,6 @@ export default class {
       data,
       isDecoding: false,
       decoded: false,
-      webAudio: true,
       locked: this.game.sound.touchLocked,
     };
     this._resolveURL(url, this._cache.sound[key]);

package/src/phaser/core/device.js

@@ -33,7 +33,6 @@ export default class {
     this.safariVersion = 0;
     this.webApp = false;
     this.silk = false;
-    this.webAudio = false;
     this.ogg = false;
     this.opus = false;
     this.mp3 = false;

package/src/phaser/core/device_util.js

@@ -232,7 +232,6 @@ export function checkVideo(device) {
  * @param {object} device TBD
  */
 export function checkAudio(device) {
-  device.webAudio = !!(window.AudioContext || window.webkitAudioContext);
   const audioElement = document.createElement('audio');
   try {
     if (audioElement.canPlayType) {

package/src/phaser/core/sound.js

@@ -34,14 +34,13 @@ export default class {
     this.pendingPlayback = false;
     this.override = false;
     this.allowMultiple = false;
-    this.usingWebAudio = this.game.sound.usingWebAudio;
     this.externalNode = null;
     this.masterGainNode = null;
     this.gainNode = null;
     this._sound = null;
     this._markedToDelete = false;
     this._removeFromSoundManager = false;
-    if (this.usingWebAudio) {
+    if (!this.game.sound.noAudio) {
       this.context = this.game.sound.context;
       this.masterGainNode = this.game.sound.masterGain;
       if (this.context.createGain === undefined) {
@@ -147,7 +146,7 @@ export default class {
     }
     this.currentTime = this.game.time.time - this.startTime;
     if (this.currentTime >= this.durationMS) {
-      if (this.usingWebAudio) {
+      if (!this.game.sound.noAudio) {
         if (this.loop) {
           //  won't work with markers, needs to reset the position
           this.onLoop.dispatch(this);
@@ -193,7 +192,7 @@ export default class {
       return this;
     }
     if (this._sound && this.isPlaying && !this.allowMultiple && (this.override || forceRestart)) {
-      if (this.usingWebAudio) {
+      if (!this.game.sound.noAudio) {
         if (this._sound.stop === undefined) {
           this._sound.noteOff(0);
         } else {
@@ -253,7 +252,7 @@ export default class {
       this._tempVolume = volume;
       this._tempLoop = loop;
     }
-    if (this.usingWebAudio) {
+    if (!this.game.sound.noAudio) {
       //  Does the sound need decoding?
       if (this.game.cache.isSoundDecoded(this.key)) {
         this._sound = this.context.createBufferSource();
@@ -340,7 +339,7 @@ export default class {
 
   resume() {
     if (this.paused && this._sound) {
-      if (this.usingWebAudio) {
+      if (!this.game.sound.noAudio) {
         const p = Math.max(0, this.position + (this.pausedPosition / 1000));
         this._sound = this.context.createBufferSource();
         this._sound.buffer = this._buffer;
@@ -369,9 +368,6 @@ export default class {
         } else {
           this._sound.start(0, p, duration);
         }
-      } else {
-        this._sound.currentTime = this._tempPause;
-        this._sound.play();
       }
       this.isPlaying = true;
       this.paused = false;
@@ -382,7 +378,7 @@ export default class {
 
   stop() {
     if (this.isPlaying && this._sound) {
-      if (this.usingWebAudio) {
+      if (!this.game.sound.noAudio) {
         if (this._sound.stop === undefined) {
           this._sound.noteOff(0);
         } else {
@@ -475,12 +471,12 @@ export default class {
     if (value) {
       this._muted = true;
       this._muteVolume = this._tempVolume;
-      if (this.usingWebAudio) {
+      if (!this.game.sound.noAudio) {
         this.gainNode.gain.value = 0;
       }
     } else {
       this._muted = false;
-      if (this.usingWebAudio) {
+      if (!this.game.sound.noAudio) {
         this.gainNode.gain.value = this._muteVolume;
       }
     }
@@ -498,7 +494,7 @@ export default class {
     }
     this._tempVolume = value;
     this._volume = value;
-    if (this.usingWebAudio) {
+    if (!this.game.sound.noAudio) {
       this.gainNode.gain.value = value;
     }
   }

package/src/phaser/core/sound_manager.js

@@ -17,7 +17,6 @@ export default class {
     this.onUnMute = new Signal();
     this.context = null;
     this.baseLatency = 0; // https://developer.mozilla.org/en-US/docs/Web/API/AudioContext/baseLatency
-    this.usingWebAudio = false;
     this.noAudio = false;
     this.connectToMaster = true;
     this.touchLocked = false;
@@ -41,7 +40,7 @@ export default class {
         this.context = new window.AudioContext();
       } catch (e) {
         this.context = null;
-        this.usingWebAudio = false;
+        this.noAudio = true;
         this.touchLocked = false;
       }
     } else if (window.webkitAudioContext) {
@@ -49,14 +48,13 @@ export default class {
         this.context = new window.webkitAudioContext();
       } catch (e) {
         this.context = null;
-        this.usingWebAudio = false;
+        this.noAudio = true;
         this.touchLocked = false;
       }
     }
     if (this.context === null || (this.context && this.context.createGain === undefined && this.context.createGainNode === undefined)) {
       this.noAudio = true;
     } else {
-      this.usingWebAudio = true;
       this.baseLatency = this.context.baseLatency || (256 / (this.context.sampleRate || 44100));
       if (this.context.createGain === undefined) {
         this.masterGain = this.context.createGainNode();
@@ -66,22 +64,31 @@ export default class {
       this.masterGain.gain.value = 1;
       this.masterGain.connect(this.context.destination);
     }
-    if (this.usingWebAudio && (this.game.device.iOS || this.game.device.android)) {
+    if (this.noAudio) {
+      return;
+    }
+    if (this.game.device.iOS || this.game.device.android) {
       this.game.input.addTouchLockCallback(this.unlock, this, true);
       this.touchLocked = true;
     }
   }
 
   checkContextState() {
-    if (this.usingWebAudio && this.context.state === 'suspended') {
-      this.game.input.onUp.addOnce(this.resumeWebAudio, this);
+    if (this.noAudio) {
+      return false;
+    }
+    if (this.context.state === 'suspended') {
+      this.game.input.onUp.addOnce(this.resumeAudioContext, this);
       return true;
     }
     return false;
   }
 
-  resumeWebAudio() {
-    if (this.usingWebAudio && this.context.state === 'suspended') {
+  resumeAudioContext() {
+    if (this.noAudio) {
+      return;
+    }
+    if (this.context.state === 'suspended') {
       this.context.resume();
     }
   }
@@ -101,7 +108,7 @@ export default class {
     } else {
       this._unlockSource.start(0);
     }
-    this.resumeWebAudio();
+    this.resumeAudioContext();
     return true;
   }
 
@@ -190,8 +197,8 @@ 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.resumeWebAudio();
-    } else if (this.usingWebAudio && this.context.state === 'interrupted') {
+      this.resumeAudioContext();
+    } else if (this.context.state === 'interrupted') {
       this.context.resume();
     }
     for (let i = 0; i < this._sounds.length; i += 1) {
@@ -259,7 +266,7 @@ export default class {
       return;
     }
     this._muted = true;
-    if (this.usingWebAudio) {
+    if (!this.noAudio) {
       this._muteVolume = this.masterGain.gain.value;
       this.masterGain.gain.value = 0;
     }
@@ -271,7 +278,7 @@ export default class {
       return;
     }
     this._muted = false;
-    if (this.usingWebAudio) {
+    if (!this.noAudio) {
       this.masterGain.gain.value = this._muteVolume;
     }
     this.onUnMute.dispatch();
@@ -327,7 +334,7 @@ export default class {
     }
     if (this._volume !== value) {
       this._volume = value;
-      if (this.usingWebAudio) {
+      if (!this.noAudio) {
         this.masterGain.gain.value = value;
       }
       this.onVolumeChange.dispatch(value);