Merge pull request cocos#2480 from umbrellaPP/v1.9

destroy audio element when stop
OnlyForDream · Apr 16, 2018 · 0344747 · 0344747
2 parents 6c833e0 + 28779f3
commit 0344747
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/cocos2d/audio/CCAudioEngine.js b/cocos2d/audio/CCAudioEngine.js
@@ -41,6 +41,7 @@ var getAudioFromPath = function (path) {
         var oldId = list.shift();
         var oldAudio = id2audio[oldId];
         oldAudio.stop();
+        oldAudio.destroy();
     }
 
     audio = new Audio(path);
@@ -365,6 +366,8 @@ var audioEngine = {
             return false;
         audio.off('load', audio.__callback);
         audio.stop();
+        audio.destroy();
+
         return true;
     },
 
@@ -380,6 +383,7 @@ var audioEngine = {
             var audio = id2audio[id];
             if (audio && audio.stop) {
                 audio.stop();
+                audio.destroy();
                 audio.off('load', audio.__callback);
             }
         }

diff --git a/cocos2d/core/components/CCAudioSource.js b/cocos2d/core/components/CCAudioSource.js
@@ -231,6 +231,7 @@ var AudioSource = cc.Class({
 
     onDestroy: function () {
         this.stop();
+        this.audio.destroy();
         cc.audioEngine.uncache(this._clip);
     },