@vpmedia/phaser 1.0.23 → 1.0.25

package/package.json

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

@@ -53,7 +53,6 @@ export default class {
         this.gainNode.connect(this.masterGainNode);
       }
     }
-    this.onDecoded = new Signal();
     this.onPlay = new Signal();
     this.onPause = new Signal();
     this.onResume = new Signal();
@@ -72,7 +71,6 @@ export default class {
     this._muteVolume = 0;
     this._tempLoop = 0;
     this._paused = false;
-    this._onDecodedEventDispatched = false;
   }
 
   soundHasUnlocked(key) {
@@ -116,7 +114,6 @@ export default class {
         this.context = null;
         this._buffer = null;
         this.externalNode = null;
-        this.onDecoded.dispose();
         this.onPlay.dispose();
         this.onPause.dispose();
         this.onResume.dispose();
@@ -133,10 +130,6 @@ export default class {
       this.destroy();
       return;
     }
-    if (this.isDecoded && !this._onDecodedEventDispatched) {
-      this.onDecoded.dispatch(this);
-      this._onDecodedEventDispatched = true;
-    }
     if (this.pendingPlayback && this.game.cache.isSoundReady(this.key)) {
       this.pendingPlayback = false;
       this.play(this._tempMarker, this._tempPosition, this._tempVolume, this._tempLoop);
@@ -435,7 +428,6 @@ export default class {
       this.context = null;
       this._buffer = null;
       this.externalNode = null;
-      this.onDecoded.dispose();
       this.onPlay.dispose();
       this.onPause.dispose();
       this.onResume.dispose();

package/src/phaser/core/sound_manager.js

@@ -11,11 +11,7 @@ export default class {
 
   constructor(game) {
     this.game = game;
-    this.onSoundDecode = new Signal();
-    this.onVolumeChange = new Signal();
-    this.onLockChange = new Signal();
-    this.onMute = new Signal();
-    this.onUnMute = new Signal();
+    this.onChange = new Signal();
     this.context = null;
     this.baseLatency = 0; // https://developer.mozilla.org/en-US/docs/Web/API/AudioContext/baseLatency
     this.noAudio = false;
@@ -72,15 +68,16 @@ export default class {
     this.masterGain.gain.value = 1;
     this.masterGain.connect(this.context.destination);
     // handle audio state unlock
+    // possible states: interrupted, suspended, running, closed
     this.onUnlockEventBinded = this.onUnlockEvent.bind(this);
     if (this.context.state === 'suspended' || this.context.state === 'interrupted') {
       this.addUnlockHandlers();
     }
     this.context.addEventListener('statechange', () => {
-      this.onLockChange.dispatch('onContextStateChange', { state: this.context.state, isLocked: this.isLocked });
+      this.onChange.dispatch('onContextStateChange', { state: this.context.state, isLocked: this.isLocked });
       if (!this.isLocked && (this.context.state === 'suspended' || this.context.state === 'interrupted')) {
         this.addUnlockHandlers();
-      } else if (this.isLocked) {
+      } else if (this.isLocked && this.context.state === 'running') {
         this.removeUnlockHandlers();
       }  
     });
@@ -88,7 +85,7 @@ export default class {
 
   addUnlockHandlers() {
     this.isLocked = true;
-    this.onLockChange.dispatch('addUnlockHandlers', { state: this.context.state, isLocked: this.isLocked });
+    this.onChange.dispatch('addUnlockHandlers', { state: this.context.state, isLocked: this.isLocked });
     document.body.addEventListener('touchstart', this.onUnlockEventBinded, false);
     document.body.addEventListener('touchend', this.onUnlockEventBinded, false);
     document.body.addEventListener('click', this.onUnlockEventBinded, false);
@@ -97,7 +94,7 @@ export default class {
 
   removeUnlockHandlers() {
     this.isLocked = false;
-    this.onLockChange.dispatch('removeUnlockHandlers', { state: this.context.state, isLocked: this.isLocked });
+    this.onChange.dispatch('removeUnlockHandlers', { state: this.context.state, isLocked: this.isLocked });
     document.body.removeEventListener('touchstart', this.onUnlockEventBinded);
     document.body.removeEventListener('touchend', this.onUnlockEventBinded);
     document.body.removeEventListener('click', this.onUnlockEventBinded);
@@ -107,16 +104,16 @@ export default class {
   onUnlockEvent(event) {
     const initialState = this.context.state;
     if (initialState !== 'suspended' && initialState !== 'interrupted') {
-      this.onLockChange.dispatch('onUnlockResumeDenied', { state: initialState, isLocked: this.isLocked, event });
+      this.onChange.dispatch('onUnlockResumeDenied', { state: initialState, isLocked: this.isLocked, event });
       this.removeUnlockHandlers();
       return;
     }
-    this.onLockChange.dispatch('onContextResumeStart', { state: initialState, isLocked: this.isLocked, event });
+    this.onChange.dispatch('onContextResumeStart', { state: initialState, isLocked: this.isLocked, event });
     this.context.resume().then(() => {
-      this.onLockChange.dispatch('onContextResumeResult', { initialState, state: this.context.state, isLocked: this.isLocked });
+      this.onChange.dispatch('onContextResumeResult', { initialState, state: this.context.state, isLocked: this.isLocked });
       this.removeUnlockHandlers();
     }).catch((e) => {
-      this.onLockChange.dispatch('onContextResumeReject', { initialState, state: this.context.state, isLocked: this.isLocked, error: e });
+      this.onChange.dispatch('onContextResumeReject', { initialState, state: this.context.state, isLocked: this.isLocked, error: e });
       this.removeUnlockHandlers();
       this.game.exceptionHandler(e, { initialState, state: this.context.state });
     });
@@ -155,7 +152,7 @@ export default class {
     }
   }
 
-  decode(key, sound = null) {
+  decode(key) {
     const soundData = this.game.cache.getSoundData(key);
     if (soundData) {
       if (this.game.cache.isSoundDecoded(key) === false) {
@@ -163,7 +160,6 @@ export default class {
         this.context.decodeAudioData(soundData)
           .then((buffer) => {
             this.game.cache.decodedSound(key, buffer);
-            this.onSoundDecode.dispatch(key, sound);
           })
           .catch((e) => {
             this.game.exceptionHandler(e, { key });
@@ -270,7 +266,7 @@ export default class {
       this._muteVolume = this.masterGain.gain.value;
       this.masterGain.gain.value = 0;
     }
-    this.onMute.dispatch();
+    this.onChange.dispatch('muted');
   }
 
   unsetMute() {
@@ -281,7 +277,7 @@ export default class {
     if (!this.noAudio) {
       this.masterGain.gain.value = this._muteVolume;
     }
-    this.onUnMute.dispatch();
+    this.onChange.dispatch('unmuted');
   }
 
   destroy() {
@@ -292,7 +288,7 @@ export default class {
       }
     }
     this._sounds = [];
-    this.onSoundDecode.dispose();
+    this.onChange.dispose();
     if (this.context) {
       if (window.PhaserRegistry) {
         window.PhaserRegistry.audioContext = this.context;
@@ -337,7 +333,6 @@ export default class {
       if (!this.noAudio) {
         this.masterGain.gain.value = value;
       }
-      this.onVolumeChange.dispatch(value);
     }
   }