Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2025-02-16 22:18:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5298 from samme/feature/audio-config-default

Browse source 
Add default value for Phaser.Core.Config#audio
This commit is contained in:
Richard Davey 2020-09-11 16:25:50 +01:00 • committed by GitHub
commit d844402d4d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/Config.js
View file

@ -303,7 +303,7 @@ var Config = new Class({
/**
* @const {Phaser.Types.Core.AudioConfig} Phaser.Core.Config#audio - The Audio Configuration object.
*/
this.audio = GetValue(config, 'audio');
this.audio = GetValue(config, 'audio', {});
// If you do: { banner: false } it won't display any banner at all

4
src/core/DebugHeader.js
View file

@ -41,11 +41,11 @@ var DebugHeader = function (game)
var audioType;
if (deviceAudio.webAudio && !(audioConfig && audioConfig.disableWebAudio))
if (deviceAudio.webAudio && !audioConfig.disableWebAudio)
{
audioType = 'Web Audio';
}
else if ((audioConfig && audioConfig.noAudio) || (!deviceAudio.webAudio && !deviceAudio.audioData))
else if (audioConfig.noAudio || (!deviceAudio.webAudio && !deviceAudio.audioData))
{
audioType = 'No Audio';
}

4
src/loader/filetypes/AudioFile.js
View file

@ -122,7 +122,7 @@ AudioFile.create = function (loader, key, urls, config, xhrSettings)
// https://developers.google.com/web/updates/2012/02/HTML5-audio-and-the-Web-Audio-API-are-BFFs
// var stream = GetFastValue(config, 'stream', false);
if (deviceAudio.webAudio && !(audioConfig && audioConfig.disableWebAudio))
if (deviceAudio.webAudio && !audioConfig.disableWebAudio)
{
return new AudioFile(loader, key, urlConfig, xhrSettings, game.sound.context);
}
@ -231,7 +231,7 @@ FileTypesManager.register('audio', function (key, urls, config, xhrSettings)
var audioConfig = game.config.audio;
var deviceAudio = game.device.audio;
if ((audioConfig && audioConfig.noAudio) || (!deviceAudio.webAudio && !deviceAudio.audioData))
if (audioConfig.noAudio || (!deviceAudio.webAudio && !deviceAudio.audioData))
{
// Sounds are disabled, so skip loading audio
return this;

6
src/sound/SoundManagerCreator.js
View file

@ -18,7 +18,7 @@ var WebAudioSoundManager = require('./webaudio/WebAudioSoundManager');
* @since 3.0.0
*
* @param {Phaser.Game} game - Reference to the current game instance.
*
*
* @return {(Phaser.Sound.HTML5AudioSoundManager|Phaser.Sound.WebAudioSoundManager|Phaser.Sound.NoAudioSoundManager)} The Sound Manager instance that was created.
*/
var SoundManagerCreator = {
@ -28,12 +28,12 @@ var SoundManagerCreator = {
var audioConfig = game.config.audio;
var deviceAudio = game.device.audio;
if ((audioConfig && audioConfig.noAudio) || (!deviceAudio.webAudio && !deviceAudio.audioData))
if (audioConfig.noAudio || (!deviceAudio.webAudio && !deviceAudio.audioData))
{
return new NoAudioSoundManager(game);
}
if (deviceAudio.webAudio && !(audioConfig && audioConfig.disableWebAudio))
if (deviceAudio.webAudio && !audioConfig.disableWebAudio)
{
return new WebAudioSoundManager(game);
}

4
src/sound/webaudio/WebAudioSoundManager.js
View file

@ -108,7 +108,7 @@ var WebAudioSoundManager = new Class({
{
var audioConfig = game.config.audio;
if (audioConfig && audioConfig.context)
if (audioConfig.context)
{
audioConfig.context.resume();
@ -355,7 +355,7 @@ var WebAudioSoundManager = new Class({
this.masterMuteNode.disconnect();
this.masterMuteNode = null;
if (this.game.config.audio && this.game.config.audio.context)
if (this.game.config.audio.context)
{
this.context.suspend();
}