@vpmedia/phaser 1.0.5 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vpmedia/phaser",
-  "version": "1.0.5",
+  "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

@@ -131,15 +131,12 @@ export default class {
     this._resolveURL(url, obj);
   }
 
-  addSound(key, url, data, webAudio = true, audioTag = false) {
-    const decoded = audioTag;
+  addSound(key, url, data) {
     this._cache.sound[key] = {
       url,
       data,
       isDecoding: false,
-      decoded,
-      webAudio,
-      audioTag,
+      decoded: false,
       locked: this.game.sound.touchLocked,
     };
     this._resolveURL(url, this._cache.sound[key]);

package/src/phaser/core/device.js

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

package/src/phaser/core/device_util.js

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

package/src/phaser/core/loader.js

@@ -627,12 +627,7 @@ export default class {
       case 'audio':
         file.url = this.getAudioURL(file.url);
         if (file.url) {
-          //  WebAudio or Audio Tag?
-          if (this.game.sound.usingWebAudio) {
-            this.xhrLoad(file, this.transformUrl(file.url, file), 'arraybuffer', this.fileComplete);
-          } else if (this.game.sound.usingAudioTag) {
-            this.loadAudioTag(file);
-          }
+          this.xhrLoad(file, this.transformUrl(file.url, file), 'arraybuffer', this.fileComplete);
         } else {
           this.fileError(file, null, 'No supported audio URL specified or device does not have audio playback support');
         }
@@ -716,35 +711,6 @@ export default class {
     console.warn('loader.loadVideoTag() is not implemented');
   }
 
-  loadAudioTag(file) {
-    const scope = this;
-    if (this.game.sound.touchLocked) {
-      // If audio is locked we can't do this yet, so need to queue this load request. Bum.
-      file.data = new Audio();
-      file.data.name = file.key;
-      file.data.preload = 'auto';
-      file.data.src = this.transformUrl(file.url, file);
-      this.fileComplete(file);
-    } else {
-      file.data = new Audio();
-      file.data.name = file.key;
-      const playThroughEvent = () => {
-        file.data.removeEventListener('canplaythrough', playThroughEvent, false);
-        file.data.onerror = null;
-        scope.fileComplete(file);
-      };
-      file.data.onerror = () => {
-        file.data.removeEventListener('canplaythrough', playThroughEvent, false);
-        file.data.onerror = null;
-        scope.fileError(file);
-      };
-      file.data.preload = 'auto';
-      file.data.src = this.transformUrl(file.url, file);
-      file.data.addEventListener('canplaythrough', playThroughEvent, false);
-      file.data.load();
-    }
-  }
-
   xhrLoad(file, url, type, onload, onerror) {
     const xhr = new XMLHttpRequest();
     xhr.open('GET', url, true);
@@ -904,14 +870,10 @@ export default class {
         this.cache.addVideo(file.key, file.url, file.data, file.asBlob);
         break;
       case 'audio':
-        if (this.game.sound.usingWebAudio) {
-          file.data = xhr.response;
-          this.cache.addSound(file.key, file.url, file.data, true, false);
-          if (file.autoDecode) {
-            this.game.sound.decode(file.key);
-          }
-        } else {
-          this.cache.addSound(file.key, file.url, file.data, false, true);
+        file.data = xhr.response;
+        this.cache.addSound(file.key, file.url, file.data);
+        if (file.autoDecode) {
+          this.game.sound.decode(file.key);
         }
         break;
       case 'text':

package/src/phaser/core/sound.js

@@ -34,15 +34,13 @@ export default class {
     this.pendingPlayback = false;
     this.override = false;
     this.allowMultiple = false;
-    this.usingWebAudio = this.game.sound.usingWebAudio;
-    this.usingAudioTag = this.game.sound.usingAudioTag;
     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) {
@@ -54,16 +52,6 @@ export default class {
       if (connect) {
         this.gainNode.connect(this.masterGainNode);
       }
-    } else if (this.usingAudioTag) {
-      if (this.game.cache.getSound(key) && this.game.cache.isSoundReady(key)) {
-        this._sound = this.game.cache.getSoundData(key);
-        this.totalDuration = 0;
-        if (this._sound.duration) {
-          this.totalDuration = this._sound.duration;
-        }
-      } else {
-        this.game.cache.onSoundUnlock.add(this.soundHasUnlocked, this);
-      }
     }
     this.onDecoded = new Signal();
     this.onPlay = new Signal();
@@ -158,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);
@@ -204,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 {
@@ -219,9 +207,6 @@ export default class {
         } else if (this.gainNode) {
           this._sound.disconnect(this.gainNode);
         }
-      } else if (this.usingAudioTag) {
-        this._sound.pause();
-        this._sound.currentTime = 0;
       }
       this.isPlaying = false;
     }
@@ -267,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();
@@ -354,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;
@@ -383,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;
@@ -396,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 {
@@ -411,9 +393,6 @@ export default class {
         } else if (this.gainNode) {
           this._sound.disconnect(this.gainNode);
         }
-      } else if (this.usingAudioTag) {
-        this._sound.pause();
-        this._sound.currentTime = 0;
       }
     }
     this.pendingPlayback = false;
@@ -458,14 +437,6 @@ export default class {
     }
   }
 
-  updateGlobalVolume(globalVolume) {
-    //  this._volume is the % of the global volume this sound should be played at
-    if (this.usingAudioTag && this._sound) {
-      this._sound.volume = globalVolume * this._volume;
-    }
-
-  }
-
   destroy(remove = true) {
     this._markedToDelete = true;
     this._removeFromSoundManager = remove;
@@ -500,17 +471,13 @@ 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 if (this.usingAudioTag && this._sound) {
-        this._sound.volume = 0;
       }
     } else {
       this._muted = false;
-      if (this.usingWebAudio) {
+      if (!this.game.sound.noAudio) {
         this.gainNode.gain.value = this._muteVolume;
-      } else if (this.usingAudioTag && this._sound) {
-        this._sound.volume = this._muteVolume;
       }
     }
     this.onMute.dispatch(this);
@@ -521,17 +488,14 @@ export default class {
   }
 
   set volume(value) {
-    const normalizedValue = this.usingAudioTag ? Math.max(0, Math.min(1, value)) : value;
     if (this._muted) {
-      this._muteVolume = normalizedValue;
+      this._muteVolume = value;
       return;
     }
-    this._tempVolume = normalizedValue;
-    this._volume = normalizedValue;
-    if (this.usingWebAudio) {
-      this.gainNode.gain.value = normalizedValue;
-    } else if (this.usingAudioTag && this._sound) {
-      this._sound.volume = normalizedValue;
+    this._tempVolume = value;
+    this._volume = value;
+    if (!this.game.sound.noAudio) {
+      this.gainNode.gain.value = value;
     }
   }
 

package/src/phaser/core/sound_manager.js

@@ -17,8 +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.usingAudioTag = false;
     this.noAudio = false;
     this.connectToMaster = true;
     this.touchLocked = false;
@@ -42,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) {
@@ -50,19 +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)) {
-      //  No Web Audio support - how about legacy Audio?
-      if (window.Audio === undefined) {
-        this.noAudio = true;
-        return;
-      }
-      this.usingAudioTag = true;
+      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();
@@ -71,45 +63,52 @@ export default class {
       }
       this.masterGain.gain.value = 1;
       this.masterGain.connect(this.context.destination);
-      if (this.context.state === 'suspended') {
-        this.game.input.onUp.addOnce(this.resumeWebAudio, this);
-      }
     }
-    if (!this.noAudio && (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;
     }
   }
 
-  resumeWebAudio() {
-    if (this.usingWebAudio && this.context.state === 'suspended') {
+  checkContextState() {
+    if (this.noAudio) {
+      return false;
+    }
+    if (this.context.state === 'suspended') {
+      this.game.input.onUp.addOnce(this.resumeAudioContext, this);
+      return true;
+    }
+    return false;
+  }
+
+  resumeAudioContext() {
+    if (this.noAudio) {
+      return;
+    }
+    if (this.context.state === 'suspended') {
       this.context.resume();
     }
   }
 
   unlock() {
-    if (this.noAudio || !this.touchLocked || this._unlockSource !== null) {
+    if (!this.touchLocked || this._unlockSource !== null) {
       return true;
     }
-    //  Global override (mostly for Audio Tag testing)
-    if (this.usingAudioTag) {
-      this.touchLocked = false;
-      this._unlockSource = null;
-    } else if (this.usingWebAudio) {
-      // Create empty buffer and play it
-      // The SoundManager.update loop captures the state of it and then resets touchLocked to false
-      const buffer = this.context.createBuffer(1, 1, 22050);
-      this._unlockSource = this.context.createBufferSource();
-      this._unlockSource.buffer = buffer;
-      this._unlockSource.connect(this.context.destination);
-      if (this._unlockSource.start === undefined) {
-        this._unlockSource.noteOn(0);
-      } else {
-        this._unlockSource.start(0);
-      }
-      this.resumeWebAudio();
+    // Create empty buffer and play it
+    // The SoundManager.update loop captures the state of it and then resets touchLocked to false
+    const buffer = this.context.createBuffer(1, 1, 22050);
+    this._unlockSource = this.context.createBufferSource();
+    this._unlockSource.buffer = buffer;
+    this._unlockSource.connect(this.context.destination);
+    if (this._unlockSource.start === undefined) {
+      this._unlockSource.noteOn(0);
+    } else {
+      this._unlockSource.start(0);
     }
-    //  We can remove the event because we've done what we needed (started the unlock sound playing)
+    this.resumeAudioContext();
     return true;
   }
 
@@ -198,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) {
@@ -267,16 +266,10 @@ export default class {
       return;
     }
     this._muted = true;
-    if (this.usingWebAudio) {
+    if (!this.noAudio) {
       this._muteVolume = this.masterGain.gain.value;
       this.masterGain.gain.value = 0;
     }
-    // Loop through sounds
-    for (let i = 0; i < this._sounds.length; i += 1) {
-      if (this._sounds[i].usingAudioTag) {
-        this._sounds[i].mute = true;
-      }
-    }
     this.onMute.dispatch();
   }
 
@@ -285,15 +278,9 @@ export default class {
       return;
     }
     this._muted = false;
-    if (this.usingWebAudio) {
+    if (!this.noAudio) {
       this.masterGain.gain.value = this._muteVolume;
     }
-    // Loop through sounds
-    for (let i = 0; i < this._sounds.length; i += 1) {
-      if (this._sounds[i].usingAudioTag) {
-        this._sounds[i].mute = false;
-      }
-    }
     this.onUnMute.dispatch();
   }
 
@@ -347,15 +334,8 @@ export default class {
     }
     if (this._volume !== value) {
       this._volume = value;
-      if (this.usingWebAudio) {
+      if (!this.noAudio) {
         this.masterGain.gain.value = value;
-      } else {
-        //  Loop through the sound cache and change the volume of all html audio tags
-        for (let i = 0; i < this._sounds.length; i += 1) {
-          if (this._sounds[i].usingAudioTag) {
-            this._sounds[i].updateGlobalVolume(value);
-          }
-        }
       }
       this.onVolumeChange.dispatch(value);
     }