Skip to content

Issue #2829: fixed a bug of WebAudioEngine that it's effect can't stop/pause when the effect didn't preload. #1259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 21, 2013
Merged

Issue #2829: fixed a bug of WebAudioEngine that it's effect can't stop/pause when the effect didn't preload. #1259

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d675037
Issue #2829: fixed a bug of WebAudioEngine that it's effect can't sto…
dingpinglv Nov 21, 2013
492c41c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
dingpinglv Nov 21, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions CocosDenshion/SimpleAudioEngine.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,7 @@ cc.WebAudioEngine = cc.AudioEngine.extend(/** @lends cc.WebAudioEngine# */{
sfxCache.sourceNode = this._ctx.createBufferSource();
sfxCache.sourceNode.buffer = this._audioData[key];
sfxCache.sourceNode.loop = loop;
sfxCache.volumeNode = this._ctx.createGainNode();
sfxCache.volumeNode = this._ctx.createGain();
sfxCache.volumeNode.gain.value = volume;

sfxCache.sourceNode.connect(sfxCache.volumeNode);
Expand Down Expand Up @@ -1123,19 +1123,24 @@ cc.WebAudioEngine = cc.AudioEngine.extend(/** @lends cc.WebAudioEngine# */{
// load now only if the type is supported and it is not being loaded currently
this._audiosLoading[keyName] = true;
var engine = this;

audioID = this._audioID++;
this._audioIDList[audioID] = null;
this._fetchData(path, function(buffer) {
// resource fetched, save it and call playEffect() again, this time it should be alright
engine._audioData[keyName] = buffer;
delete engine._audiosLoading[keyName];
engine.playEffect(path, loop);
engine._audioIDList[audioID] = engine._beginSound(keyName, loop, engine.getEffectsVolume());
}, function() {
// resource fetching failed, doing nothing here
delete engine._audiosLoading[keyName];
delete engine._audioIDList[audioID];
/*
* Potential Bug: if fetching data fails every time, loading will be tried again and again.
* Preloading would prevent this issue: if it fails to fetch, preloading procedure will not achieve 100%.
*/
});
return audioID;
}
return null;
},
Expand Down Expand Up @@ -1175,7 +1180,7 @@ cc.WebAudioEngine = cc.AudioEngine.extend(/** @lends cc.WebAudioEngine# */{
_pauseSoundList: function(effectList) {
for (var idx = 0, len = effectList.length; idx < len; idx++) {
var sfxCache = effectList[idx];
if (this._isSoundPlaying(sfxCache))
if (sfxCache && this._isSoundPlaying(sfxCache))
this._pauseSound(sfxCache);
}
},
Expand All @@ -1193,7 +1198,7 @@ cc.WebAudioEngine = cc.AudioEngine.extend(/** @lends cc.WebAudioEngine# */{

if (this._audioIDList.hasOwnProperty(audioID)){
var sfxCache = this._audioIDList[audioID];
if (this._isSoundPlaying(sfxCache))
if (sfxCache && this._isSoundPlaying(sfxCache))
this._pauseSound(sfxCache);
}
},
Expand Down Expand Up @@ -1239,7 +1244,7 @@ cc.WebAudioEngine = cc.AudioEngine.extend(/** @lends cc.WebAudioEngine# */{

if (this._audioIDList.hasOwnProperty(audioID)){
var sfxCache = this._audioIDList[audioID];
if (this._isSoundPaused(sfxCache)){
if (sfxCache && this._isSoundPaused(sfxCache)){
this._audioIDList[audioID] = this._resumeSound(sfxCache, this.getEffectsVolume());
this._updateEffectsList(sfxCache, this._audioIDList[audioID]);
}
Expand Down