From fee3a0a7bd76bbb1eef3239bc8d03852a7109419 Mon Sep 17 00:00:00 2001 From: VisualSJ Date: Tue, 21 Nov 2017 10:37:05 +0800 Subject: [PATCH] support playMusic --- cocos2d/audio/CCAudioEngine.js | 248 +++++++++++++++++++++++++++++++++ cocos2d/audio/deprecated.js | 178 +---------------------- jsb/jsb-audio.js | 88 +++++++++++- 3 files changed, 336 insertions(+), 178 deletions(-) diff --git a/cocos2d/audio/CCAudioEngine.js b/cocos2d/audio/CCAudioEngine.js index 3dd6f0c986..410bebf020 100644 --- a/cocos2d/audio/CCAudioEngine.js +++ b/cocos2d/audio/CCAudioEngine.js @@ -504,6 +504,254 @@ var audioEngine = { audio.resume(); } this._breakCache = null; + }, + + /////////////////////////////// + // Classification of interface + + _music: { + id: -1, + loop: false, + volume: 1, + }, + + _effect: { + volume: 1, + pauseCache: [], + }, + + /** + * !#en Play background music + * !#zh 播放背景音乐 + * @method playMusic + * @param {String} filePath - The path of the audio file without filename extension. + * @param {Boolean} loop - Whether the music loop or not. + * @return {Number} audioId + * @example + * var audioID = cc.audioEngine.playMusic(path, false); + */ + playMusic: function (filePath, loop) { + var music = this._music; + this.stop(music.id); + music.id = this.play(filePath, loop, music.volume); + music.loop = loop; + return music.id; + }, + + /** + * !#en Stop background music. + * !#zh 停止播放背景音乐。 + * @method stopMusic + * @example + * cc.audioEngine.stopMusic(); + */ + stopMusic: function () { + this.stop(this._music.id); + }, + + /** + * !#en Pause the background music. + * !#zh 暂停播放背景音乐。 + * @method pauseMusic + * @example + * cc.audioEngine.pauseMusic(); + */ + pauseMusic: function () { + this.pause(this._music.id); + return this._music.id; + }, + + /** + * !#en Resume playing background music. + * !#zh 恢复播放背景音乐。 + * @method resumeMusic + * //example + * cc.audioEngine.resumeMusic(); + */ + resumeMusic: function () { + this.resume(this._music.id); + return this._music.id; + }, + + /** + * !#en Get the volume(0.0 ~ 1.0). + * !#zh 获取音量(0.0 ~ 1.0)。 + * @method getMusicVolume + * @return {Number} + * @example + * var volume = cc.audioEngine.getMusicVolume(); + */ + getMusicVolume: function () { + return this._music.volume; + }, + + /** + * !#en Set the background music volume. + * !#zh 设置背景音乐音量(0.0 ~ 1.0)。 + * @method setMusicVolume + * @param {Number} volume - Volume must be in 0.0~1.0. + * @example + * cc.audioEngine.setMusicVolume(0.5); + */ + setMusicVolume: function (volume) { + var music = this._music; + music.volume = volume; + this.setVolume(music.id, music.volume); + return music.volume; + }, + + /** + * !#en Background music playing state + * !#zh 背景音乐是否正在播放 + * @method isMusicPlaying + * @return {Boolean} + * @example + * cc.audioEngine.isMusicPlaying(); + */ + isMusicPlaying: function () { + return this.getState(this._music.id) === this.AudioState.PLAYING; + }, + + /** + * !#en Play effect audio. + * !#zh 播放音效 + * @method playEffect + * @param {String} filePath - The path of the audio file without filename extension. + * @param {Boolean} loop - Whether the music loop or not. + * @return {Number} audioId + * @example + * var audioID = cc.audioEngine.playEffect(path, false); + */ + playEffect: function (filePath, loop) { + var effect = this._effect; + return this.play(filePath, loop || false, effect.volume); + }, + + /** + * !#en Set the volume of effect audio. + * !#zh 设置音效音量(0.0 ~ 1.0)。 + * @method setEffectsVolume + * @param {Number} volume - Volume must be in 0.0~1.0. + * @example + * cc.audioEngine.setEffectsVolume(0.5); + */ + setEffectsVolume: function (volume) { + this._effect.volume = volume; + var id2audio = audioEngine._id2audio; + for (var id in id2audio) { + if (id === musicId) continue; + audioEngine.setVolume(id, volume); + } + }, + + /** + * !#en The volume of the effect audio max value is 1.0,the min value is 0.0 . + * !#zh 获取音效音量(0.0 ~ 1.0)。 + * @method getEffectsVolume + * @return {Number} + * @example + * var volume = cc.audioEngine.getEffectsVolume(); + */ + getEffectsVolume: function () { + return this._effect.volume; + }, + + /** + * !#en Pause effect audio. + * !#zh 暂停播放音效。 + * @method pauseEffect + * @param {Number} audioID - audio id. + * @example + * cc.audioEngine.pauseEffect(audioID); + */ + pauseEffect: function (audioID) { + return this.pause(audioID); + }, + + /** + * !#en Stop playing all the sound effects. + * !#zh 暂停播放所有音效。 + * @method pauseAllEffects + * @example + * cc.audioEngine.pauseAllEffects(); + */ + pauseAllEffects: function () { + var musicId = this._music.id; + var effect = this._effect; + var id2audio = this._id2audio; + effect.pauseCache.length = 0; + + for (var id in id2audio) { + if (id === musicId) continue; + var audio = id2audio[id]; + var state = audio.getState(); + if (state === this.AudioState.PLAYING) { + effect.pauseCache.push(id); + audio.pause(); + } + } + }, + + /** + * !#en Resume effect audio. + * !#zh 恢复播放音效音频。 + * @method resumeEffect + * @param {Number} audioID - The return value of function play. + * //example + * cc.audioEngine.resumeEffect(audioID); + */ + resumeEffect: function (id) { + this.resume(id); + }, + + /** + * !#en Resume all effect audio. + * !#zh 恢复播放所有之前暂停的音效。 + * @method resumeAllEffects + * @example + * cc.audioEngine.resumeAllEffects(); + */ + resumeAllEffects: function () { + var pauseIDCache = this._effect.pauseCache; + var id2audio = this._id2audio; + while (pauseIDCache.length > 0) { + var id = pauseIDCache.pop(); + var audio = id2audio[id]; + if (audio && audio.resume) + audio.resume(); + } + }, + + /** + * !#en Stop playing the effect audio. + * !#zh 停止播放音效。 + * @method stopEffect + * @param {Number} audioID - audio id. + * @example + * cc.audioEngine.stopEffect(id); + */ + stopEffect: function (audioID) { + return this.stop(audioID); + }, + + /** + * !#en Stop playing all the effects. + * !#zh 停止播放所有音效。 + * @method stopAllEffects + * @example + * cc.audioEngine.stopAllEffects(); + */ + stopAllEffects: function () { + var musicId = this._music.id; + var id2audio = this._id2audio; + for (var id in id2audio) { + if (id === musicId) continue; + var audio = id2audio[id]; + var state = audio.getState(); + if (state === audioEngine.AudioState.PLAYING) { + audio.stop(); + } + } } }; diff --git a/cocos2d/audio/deprecated.js b/cocos2d/audio/deprecated.js index 4a96eb914d..6e0b459c4d 100644 --- a/cocos2d/audio/deprecated.js +++ b/cocos2d/audio/deprecated.js @@ -25,7 +25,7 @@ ****************************************************************************/ var js = cc.js; -// var INFO = cc._LogInfos.deprecated; +var INFO = cc._LogInfos.deprecated; exports.removed = function (audioEngine) { function willPlayMusicError () { @@ -42,185 +42,15 @@ exports.deprecated = function (audioEngine) { var musicVolume = 1; var effectsVolume = 1; var pauseIDCache = []; - js.get(audioEngine, 'playMusic', function () { - // cc.warn(INFO, 'audioEngine.playMusic', 'audioEngine.play'); - return function (url, loop) { - audioEngine.stop(musicId); - musicId = audioEngine.play(url, loop, musicVolume); - musicPath = url; - musicLoop = loop; - return musicId; - } - }); - js.get(audioEngine, 'stopMusic', function () { - // cc.warn(INFO, 'audioEngine.stopMusic', 'audioEngine.stop'); - return function () { - audioEngine.stop(musicId); - return musicId; - } - }); - js.get(audioEngine, 'pauseMusic', function () { - // cc.warn(INFO, 'audioEngine.pauseMusic', 'audioEngine.pause'); - return function () { - audioEngine.pause(musicId); - return musicId; - } - }); - js.get(audioEngine, 'resumeMusic', function () { - // cc.warn(INFO, 'audioEngine.resumeMusic', 'audioEngine.resume'); - return function () { - audioEngine.resume(musicId); - return musicId; - } - }); js.get(audioEngine, 'rewindMusic', function () { - // cc.warn(INFO, 'audioEngine.rewindMusic', 'audioEngine.setCurrentTime'); + cc.warn(INFO, 'audioEngine.rewindMusic', 'audioEngine.setCurrentTime'); return function () { audioEngine.setCurrentTime(musicId, 0); return musicId; } }); - js.get(audioEngine, 'getMusicVolume', function () { - // cc.warn(INFO, 'audioEngine.getMusicVolume', 'audioEngine.getVolume'); - return function () { - return musicVolume; - } - }); - js.get(audioEngine, 'setMusicVolume', function () { - // cc.warn(INFO, 'audioEngine.setMusicVolume', 'audioEngine.setVolume'); - return function (volume) { - musicVolume = volume; - audioEngine.setVolume(musicId, musicVolume); - return musicVolume; - } - }); - js.get(audioEngine, 'isMusicPlaying', function () { - // cc.warn(INFO, 'audioEngine.isMusicPlaying', 'audioEngine.getState'); - return function () { - return audioEngine.getState(musicId) === audioEngine.AudioState.PLAYING; - } - }); - js.get(audioEngine, 'playEffect', function () { - // cc.warn(INFO, 'audioEngine.playEffect', 'audioEngine.play'); - return function (url, loop, volume) { - return audioEngine.play(url, loop || false, volume === undefined ? effectsVolume : volume); - } - }); - js.get(audioEngine, 'setEffectsVolume', function (volume) { - // cc.warn(INFO, 'audioEngine.setEffectsVolume', 'audioEngine.setVolume'); - return function (volume) { - effectsVolume = volume; - var id2audio = audioEngine._id2audio; - for (var id in id2audio) { - if (id === musicId) continue; - audioEngine.setVolume(id, volume); - } - } - }); - js.get(audioEngine, 'getEffectsVolume', function () { - // cc.warn(INFO, 'audioEngine.getEffectsVolume', 'audioEngine.getVolume'); - return function () { - return effectsVolume; - } - }); - js.get(audioEngine, 'pauseEffect', function () { - // cc.warn(INFO, 'audioEngine.pauseEffect', 'audioEngine.pause'); - - return function (id) { - return audioEngine.pause(id); - } - }); - js.get(audioEngine, 'pauseAllEffects', function () { - // cc.warn(INFO, 'audioEngine.pauseAllEffects', 'audioEngine.pauseAll'); - - if (CC_JSB) { - return function () { - var musicPlay = audioEngine.getState(musicId) === audioEngine.AudioState.PLAYING; - audioEngine.pauseAll(); - if (musicPlay) { - audioEngine.resume(musicId); - } - } - } - - return function () { - pauseIDCache.length = 0; - var id2audio = audioEngine._id2audio; - for (var id in id2audio) { - if (id === musicId) continue; - var audio = id2audio[id]; - var state = audio.getState(); - if (state === audioEngine.AudioState.PLAYING) { - pauseIDCache.push(id); - audio.pause(); - } - } - } - }); - js.get(audioEngine, 'resumeEffect', function () { - // cc.warn(INFO, 'audioEngine.resumeEffect', 'audioEngine.resume'); - return function (id) { - audioEngine.resume(id); - } - }); - js.get(audioEngine, 'resumeAllEffects', function () { - // cc.warn(INFO, 'audioEngine.resumeEffect', 'audioEngine.resume'); - - if (CC_JSB) { - return function () { - var musicPaused = audioEngine.getState(musicId) === audioEngine.AudioState.PAUSED; - audioEngine.resumeAll(); - if (musicPaused && audioEngine.getState(musicId) === audioEngine.AudioState.PLAYING) { - audioEngine.pause(musicId); - } - }; - } - - return function () { - var id2audio = audioEngine._id2audio; - while (pauseIDCache.length > 0) { - var id = pauseIDCache.pop(); - var audio = id2audio[id]; - if (audio && audio.resume) - audio.resume(); - } - } - }); - js.get(audioEngine, 'stopEffect', function () { - // cc.warn(INFO, 'audioEngine.stopEffect', 'audioEngine.stop'); - return function (id) { - return audioEngine.stop(id); - } - }); - js.get(audioEngine, 'stopAllEffects', function () { - // cc.warn(INFO, 'audioEngine.stopAllEffects', 'audioEngine.stopAll'); - - if (CC_JSB) { - return function () { - var musicPlay = audioEngine.getState(musicId) === audioEngine.AudioState.PLAYING; - var currentTime = audioEngine.getCurrentTime(musicId); - audioEngine.stopAll(); - if (musicPlay) { - musicId = audioEngine.play(musicPath, musicLoop); - audioEngine.setCurrentTime(musicId, currentTime); - } - } - } - - return function () { - var id2audio = audioEngine._id2audio; - for (var id in id2audio) { - if (id === musicId) continue; - var audio = id2audio[id]; - var state = audio.getState(); - if (state === audioEngine.AudioState.PLAYING) { - audio.stop(); - } - } - } - }); js.get(audioEngine, 'unloadEffect', function () { - // cc.warn(INFO, 'audioEngine.unloadEffect', 'audioEngine.stop'); + cc.warn(INFO, 'audioEngine.unloadEffect', 'audioEngine.stop'); return function (id) { return audioEngine.stop(id); } @@ -228,7 +58,7 @@ exports.deprecated = function (audioEngine) { if (!CC_JSB) { js.get(audioEngine, 'end', function () { - // cc.warn(INFO, 'audioEngine.end', 'audioEngine.stopAll'); + cc.warn(INFO, 'audioEngine.end', 'audioEngine.stopAll'); return function () { return audioEngine.stopAll(); } diff --git a/jsb/jsb-audio.js b/jsb/jsb-audio.js index c97d58e13d..a2a7449b1c 100644 --- a/jsb/jsb-audio.js +++ b/jsb/jsb-audio.js @@ -47,10 +47,6 @@ cc.Audio.Type = { cc.audioEngine = audioEngine; audioEngine.play = audioEngine.play2d; audioEngine.setMaxWebAudioSize = function () {}; - // deprecated - var Module = require('../cocos2d/audio/deprecated'); - Module.removed(audioEngine); - Module.deprecated(audioEngine); proto.State = audioEngine.AudioState; @@ -148,4 +144,88 @@ cc.Audio.Type = { return true; }; + var _music = { + id: -1, + url: '', + volume: 1 + }; + var _effect = { + volume: 1 + }; + audioEngine.playMusic = function (filePath, loop) { + audioEngine.stop(_music.id); + _music.id = audioEngine.play(filePath, loop, _music.volume); + _music.loop = loop; + _music.url = filePath; + return _music.id; + }; + audioEngine.stopMusic = function () { + audioEngine.stop(_music.id); + }; + audioEngine.pauseMusic = function () { + audioEngine.pause(_music.id); + return _music.id; + }; + audioEngine.resumeMusic = function () { + audioEngine.resume(_music.id); + return _music.id; + }; + audioEngine.getMusicVolume = function () { + return _music.volume; + }; + audioEngine.setMusicVolume = function (volume) { + _music.volume = volume; + audioEngine.setVolume(_music.id, _music.volume); + return _music.volume; + }; + audioEngine.isMusicPlaying = function () { + return audioEngine.getState(_music.id) === audioEngine.AudioState.PLAYING; + }; + audioEngine.playEffect = function (filePath, loop) { + return audioEngine.play(filePath, loop || false, _effect.volume); + }; + audioEngine.setEffectsVolume = function (volume) { + _effect.volume = volume; + }; + audioEngine.getEffectsVolume = function () { + return _effect.volume; + }; + audioEngine.pauseEffect = function (audioID) { + return audioEngine.pause(audioID); + }; + audioEngine.pauseAllEffects = function () { + var musicPlay = audioEngine.getState(_music.id) === audioEngine.AudioState.PLAYING; + audioEngine.pauseAll(); + if (musicPlay) { + audioEngine.resume(_music.id); + } + }; + audioEngine.resumeEffect = function (id) { + audioEngine.resume(id); + }; + audioEngine.resumeAllEffects = function () { + var musicPaused = audioEngine.getState(_music.id) === audioEngine.AudioState.PAUSED; + audioEngine.resumeAll(); + if (musicPaused && audioEngine.getState(_music.id) === audioEngine.AudioState.PLAYING) { + audioEngine.pause(_music.id); + } + }; + audioEngine.stopEffect = function (id) { + return audioEngine.stop(id); + }; + audioEngine.stopAllEffects = function () { + var musicPlay = audioEngine.getState(_music.id) === audioEngine.AudioState.PLAYING; + var currentTime = audioEngine.getCurrentTime(_music.id); + audioEngine.stopAll(); + if (musicPlay) { + _music.id = audioEngine.play(_music.url, _music.loop); + audioEngine.setCurrentTime(_music.id, currentTime); + } + }; + + // deprecated + var Module = require('../cocos2d/audio/deprecated'); + Module.removed(audioEngine); + Module.deprecated(audioEngine); + })(cc.Audio.prototype, jsb.AudioEngine); \ No newline at end of file