Merge branch 'master' of https://github.com/photonstorm/phaser

Author: photonstorm

v3/src/sound/BaseSound.js

@@ -0,0 +1,60 @@
+var Class = require('../utils/Class');
+var Extend = require('../utils/object/Extend');
+var EventDispatcher = require('../events/EventDispatcher');
+//  Phaser.Sound.BaseSound
+var BaseSound = new Class({
+    initialize: function BaseSound(manager, key, config) {
+        /**
+         * Local reference to sound manager.
+         * @property {Phaser.Sound.BaseSoundManager} manager
+         */
+        this.manager = manager;
+        this.key = key;
+        this.config = Extend({
+            mute: false,
+            volume: 1,
+            rate: 1,
+            seek: 0,
+            loop: false,
+            pan: 0,
+            duration: 0 // TODO set duration to correct value
+        }, config);
+        this.isPlaying = false;
+        this.markers = {};
+        this.currentMarker = '';
+        this.fadeTween = null; // TODO see how to use global tween
+        this.mute = false;
+        this.volume = 1;
+        this.rate = 1;
+        this.seek = 0;
+        this.loop = false;
+        this.pan = 0;
+        this.events = new EventDispatcher();
+    },
+    addMarker: function (marker) {
+        return false;
+    },
+    removeMarker: function (markerName) {
+        return false;
+    },
+    play: function (marker, config) {
+        return this;
+    },
+    pause: function () {
+        return this;
+    },
+    resume: function () {
+        return this;
+    },
+    stop: function () {
+        return this;
+    },
+    fadeTo: function (volume, duration) {
+        return null;
+    },
+    update: function () {
+    },
+    destroy: function () {
+    }
+});
+module.exports = BaseSound;

v3/src/sound/WebAudioSound.js

@@ -0,0 +1,11 @@
+var Class = require('../utils/Class');
+var BaseSound = require('./BaseSound');
+//  Phaser.Sound.WebAudioSound
+var WebAudioSound = new Class({
+    Extends: BaseSound,
+    initialize: function WebAudioSound(manager, key, config) {
+        // TODO update config duration
+        BaseSound.call(this, manager, key, config);
+    }
+});
+module.exports = WebAudioSound;

v3/src/sound/WebAudioSoundManager.js

@@ -1,37 +1,22 @@
 var Class = require('../utils/Class');
 var BaseSoundManager = require('./BaseSoundManager');
-
 //  Phaser.Loader.WebAudioSoundManager
-
 var WebAudioSoundManager = new Class({
-
     Extends: BaseSoundManager,
-
-    initialize:
-
-    function WebAudioSoundManager (game)
-    {
-        BaseSoundManager.call(this, game);
-
+    initialize: function WebAudioSoundManager(game) {
         /**
          * @property {AudioContext} context - The AudioContext being used for playback.
          * @default
          */
         this.context = this.createAudioContext();
+        BaseSoundManager.call(this, game);
     },
-
-    createAudioContext: function ()
-    {
+    createAudioContext: function () {
         var audioConfig = this.game.config.audio;
-
-        if (audioConfig && audioConfig.context)
-        {
+        if (audioConfig && audioConfig.context) {
             return audioConfig.context;
         }
-
         return new (window['AudioContext'] || window['webkitAudioContext'])();
     }
-
 });
-
 module.exports = WebAudioSoundManager;

v3/src/sound/index.js

@@ -5,6 +5,8 @@ module.exports = {
     Dynamic: require('./dynamic'),
 
     BaseSoundManager: require('./BaseSoundManager'),
-    WebAudioSoundManager: require('./WebAudioSoundManager')
+    WebAudioSoundManager: require('./WebAudioSoundManager'),
+
+    BaseSound: require('./BaseSound')
 
 };