Skip to content
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.

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

fix load mp3 as audioClip #3712

Merged
merged 1 commit into from Jan 3, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 9 additions & 2 deletions cocos2d/core/assets/CCAudioClip.js
Expand Up @@ -61,8 +61,15 @@ var AudioClip = cc.Class({
return this._audio;
},
set (value) {
this._audio = value;
if (value) {
// HACK: fix load mp3 as audioClip, _nativeAsset is set as audioClip.
// Should load mp3 as audioBuffer indeed.
if (value instanceof cc.AudioClip) {
this._audio = value._nativeAsset;
}
else {
this._audio = value;
}
if (this._audio) {
this.loaded = true;
this.emit('load');
}
Expand Down