Audio play flags move to cc.Audio

Author: VisualSJ

cocos2d/audio/CCAudio.js

@@ -83,6 +83,7 @@
  * Encapsulate DOM and webAudio
  */
 cc.Audio = cc.Class.extend({
+    interruptPlay: false,
     src: null,
     _element: null,
     _AUDIO_TYPE: "AUDIO",
@@ -110,7 +111,10 @@ cc.Audio = cc.Class.extend({
     },
 
     play: function (offset, loop) {
-        if (!this._element) return;
+        if (!this._element) {
+            this.interruptPlay = false;
+            return;
+        }
         this._element.loop = loop;
         this._element.play();
         if (this._AUDIO_TYPE === 'AUDIO' && this._element.paused) {
@@ -131,7 +135,10 @@ cc.Audio = cc.Class.extend({
     },
 
     stop: function () {
-        if (!this._element) return;
+        if (!this._element) {
+            this.interruptPlay = true;
+            return;
+        }
         this._element.pause();
         try {
             this._element.currentTime = 0;
@@ -140,12 +147,18 @@ cc.Audio = cc.Class.extend({
     },
 
     pause: function () {
-        if (!this._element) return;
+        if (!this._element) {
+            this.interruptPlay = true;
+            return;
+        }
         this._element.pause();
     },
 
     resume: function () {
-        if (!this._element) return;
+        if (!this._element) {
+            this.interruptPlay = false;
+            return;
+        }
         this._element.play();
     },
 
@@ -503,7 +516,6 @@ cc.Audio.WebAudio.prototype = {
             return false;
         },
 
-        _waitLoadPlayFlag: true,
         /**
          * Play music.
          * @param {String} url The path of the music file without filename extension.
@@ -513,17 +525,15 @@ cc.Audio.WebAudio.prototype = {
          * cc.audioEngine.playMusic(path, false);
          */
         playMusic: function(url, loop){
-            this._waitLoadPlayFlag = true;
             var bgMusic = this._currMusic;
             if (bgMusic && bgMusic.getPlaying()) {
                 bgMusic.stop();
             }
             var musicVolume = this._musicVolume;
             var audio = cc.loader.getRes(url);
-            var self = this;
             if (!audio) {
                 cc.loader.load(url, function () {
-                    if (self._waitLoadPlayFlag && !audio.getPlaying()) {
+                    if (!audio.getPlaying() && !audio.interruptPlay) {
                         audio.setVolume(musicVolume);
                         audio.play(0, loop || false);
                     }
@@ -545,7 +555,6 @@ cc.Audio.WebAudio.prototype = {
          */
         stopMusic: function(releaseData){
             var audio = this._currMusic;
-            this._waitLoadPlayFlag = false;
             if (audio) {
                 var list = cc.Audio.touchPlayList;
                 for (var i=list.length-1; i>=0; --i) {
@@ -568,7 +577,6 @@ cc.Audio.WebAudio.prototype = {
          */
         pauseMusic: function () {
             var audio = this._currMusic;
-            this._waitLoadPlayFlag = false;
             if (audio)
                 audio.pause();
         },