From bbebf9f5b35f56139ce53d37a5c4eae8d22e79f9 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Tue, 22 Mar 2016 18:43:38 +0800 Subject: [PATCH] Fix Loader usage in Audio --- cocos2d/audio/CCAudio.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cocos2d/audio/CCAudio.js b/cocos2d/audio/CCAudio.js index 013429b63e..85df6850c2 100644 --- a/cocos2d/audio/CCAudio.js +++ b/cocos2d/audio/CCAudio.js @@ -369,11 +369,14 @@ JS.mixin(cc.Audio.prototype, { if(bgMusic && bgMusic.src !== url && bgMusic.getPlaying()){ bgMusic.stop(); } - var audio = cc.loader.getRes(url); + var item = cc.loader.getItem(url); + var audio = item && item.audio ? item.audio : null; if(!audio){ var self = this; - cc.loader.load(url, function (error, audio) { + cc.loader.load(url, function (error) { if (!error) { + var item = cc.loader.getItem(url); + var audio = item && item.audio ? item.audio : null; audio.play(0, loop); audio.setVolume(self._musicVolume); self._currMusic = audio;