update howler to 1.0.7, code implementation complete

Author: many20

HowlerAudioEngine.js

@@ -86,7 +86,7 @@ cc.HowlerAudioEngine = cc.AudioEngine.extend(/** @lends cc.AudioEngine# */{
         }
         this._playingMusic = keyname;
 
-        if (this._effectList.hasOwnProperty(keyname)) {
+        if (this._muiscList.hasOwnProperty(keyname)) {
             au = this._muiscList[keyname];
         } else {
             au = new Howl({
@@ -214,24 +214,19 @@ cc.HowlerAudioEngine = cc.AudioEngine.extend(/** @lends cc.AudioEngine# */{
             this._effectList[keyname] = au;
         }
 
+        //to prevent a bug. when one effect plays in a loop,
+        //no effect of the same type can play at the same time
+        if (au.loop()) {
+            return keyname;
+        }
+
         if (loop) {
             au.loop(loop);
         }
         au.play();
         return keyname;
     },
 
-    /**
-     *The volume of the effects max value is 1.0,the min value is 0.0 .
-     * @return {Number}
-     * @example
-     * //example
-     * var effectVolume = cc.AudioEngine.getInstance().getEffectsVolume();
-     */
-    getEffectsVolume:function () {
-        return this._effectList[0].volume();
-    },
-
     /**
      * Set the volume of sound effecs.
      * @param {Number} volume Volume must be in 0.0~1.0 .
@@ -250,8 +245,10 @@ cc.HowlerAudioEngine = cc.AudioEngine.extend(/** @lends cc.AudioEngine# */{
             this._effectsVolume = volume;
         }
 
-        for (var i = this._effectList.length - 1; i >= 0; i--) {
-            this._effectList[i].volume(volume);
+        for (var key in this._effectList) {
+            if (this._effectList.hasOwnProperty(key)) {
+                this._effectList[key].volume(volume);
+            }
         }
     },
 
@@ -265,7 +262,7 @@ cc.HowlerAudioEngine = cc.AudioEngine.extend(/** @lends cc.AudioEngine# */{
     pauseEffect:function (path) {
         var keyname = this._getPathWithoutExt(path);
         if (this._effectList.hasOwnProperty(keyname)) {
-            this._effectList[keyname].pause();
+            this._effectList[keyname].loop(false).pause();
         }
     },
 
@@ -276,8 +273,10 @@ cc.HowlerAudioEngine = cc.AudioEngine.extend(/** @lends cc.AudioEngine# */{
      * cc.AudioEngine.getInstance().pauseAllEffects();
      */
     pauseAllEffects:function () {
-        for (var i = this._effectList.length - 1; i >= 0; i--) {
-            this._effectList[i].pause();
+        for (var key in this._effectList) {
+            if (this._effectList.hasOwnProperty(key)) {
+                this._effectList[key].loop(false).pause();
+            }
         }
     },
 
@@ -302,8 +301,10 @@ cc.HowlerAudioEngine = cc.AudioEngine.extend(/** @lends cc.AudioEngine# */{
      * cc.AudioEngine.getInstance().resumeAllEffects();
      */
     resumeAllEffects:function () {
-        for (var i = this._effectList.length - 1; i >= 0; i--) {
-            this._effectList[i].play();
+        for (var key in this._effectList) {
+            if (this._effectList.hasOwnProperty(key)) {
+                this._effectList[key].play();
+            }
         }
     },
 
@@ -317,7 +318,7 @@ cc.HowlerAudioEngine = cc.AudioEngine.extend(/** @lends cc.AudioEngine# */{
     stopEffect:function (path) {
         var keyname = this._getPathWithoutExt(path);
         if (this._effectList.hasOwnProperty(keyname)) {
-            this._effectList[keyname].stop();
+            this._effectList[keyname].loop(false).stop();
         }
     },
 
@@ -328,8 +329,10 @@ cc.HowlerAudioEngine = cc.AudioEngine.extend(/** @lends cc.AudioEngine# */{
      * cc.AudioEngine.getInstance().stopAllEffects();
      */
     stopAllEffects:function () {
-        for (var i = this._effectList.length - 1; i >= 0; i--) {
-            this._effectList[i].stop();
+        for (var key in this._effectList) {
+            if (this._effectList.hasOwnProperty(key)) {
+                this._effectList[key].loop(false).stop();
+            }
         }
     }
 

howler/howler.js

@@ -1,5 +1,5 @@
 /*!
- *  howler.js v1.0.6
+ *  howler.js v1.0.7
  *  howlerjs.com
  *
  *  (c) 2013, James Simpson of GoldFire Studios
@@ -44,7 +44,7 @@
     volume: function(vol) {
       var self = this;
 
-      if (vol >= 0 && vol <= 1) {
+      if (vol && vol >= 0 && vol <= 1) {
         self._volume = vol;
 
         if (usingWebAudio) {
@@ -126,7 +126,7 @@
   // allow access to the global audio controls
   window.Howler = new HowlerGlobal();
 
-  // chek for browser codec support
+  // check for browser codec support
   var audioTest = new Audio();
   var codecs = {
     mp3: !!audioTest.canPlayType('audio/mpeg;').replace(/^no$/,''),
@@ -321,12 +321,15 @@
 
           // end the track if it is HTML audio
           if (!self._webAudio) {
-            self.pause(data.id);
+            self.pause(data.id, data.timer);
           }
 
           // fire ended event
           self.on('end');
         }, duration * 1000));
+
+        // remember which timer to cancel
+        data.timer = self._onendTimer[self._onendTimer.length - 1];
       })();
 
       if (self._webAudio) {
@@ -349,9 +352,10 @@
     /**
      * Pause playback and save the current position.
      * @param {String} id (optional) Used only for HTML5 Audio to pause specific node.
+     * @param {String} id (optional) Used only for HTML5 Audio to clear the correct timeout id.
      * @return {Object}
      */
-    pause: function(id) {
+    pause: function(id, timerId) {
       var self = this;
 
       // if the sound hasn't been loaded, add it to the event queue
@@ -364,9 +368,10 @@
       }
 
       // clear 'onend' timer
-      if (self._onendTimer[0]) {
-        clearTimeout(self._onendTimer[0]);
-        self._onendTimer.splice(0, 1);
+      var timer = self._onendTimer.indexOf(timerId);
+      if (timer >= 0) {
+        clearTimeout(self._onendTimer[timer]);
+        self._onendTimer.splice(timer, 1);
       }
 
       if (self._webAudio) {
@@ -846,7 +851,11 @@
     var loadBuffer = function(obj, url) {
       // check if the buffer has already been cached
       if (url in cache) {
-        loadSound(obj, cache[url]);
+        // set the duration from the cache
+        obj._duration = cache[url].duration;
+
+        // load the sound into this object
+        loadSound(obj);
       } else {
         // load the buffer from the URL
         var xhr = new XMLHttpRequest();