Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-16 01:38:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tidying up this class. Better name, lock handling and onload

Browse source
This commit is contained in:
Richard Davey 2021-11-22 23:53:20 +00:00
parent 435aed229c
commit 3f237d6e1e
1 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/loader/filetypes/HTML5AudioFile.js
View file

@ -5,6 +5,7 @@
*/
var Class = require('../../utils/Class');
var CONST = require('../const');
var Events = require('../events');
var File = require('../File');
var GetFastValue = require('../../utils/object/GetFastValue');
@ -58,7 +59,8 @@ var HTML5AudioFile = new Class({
File.call(this, loader, fileConfig);
// New properties specific to this class
this.locked = 'ontouchstart' in window;
this.soundManager = loader.systems.sound;
this.locked = this.soundManager.locked;
this.loaded = false;
this.filesLoaded = 0;
this.filesTotal = 0;
@ -107,6 +109,8 @@ var HTML5AudioFile = new Class({
* @method Phaser.Loader.FileTypes.HTML5AudioFile#onProgress
* @fires Phaser.Loader.Events#FILE_PROGRESS
* @since 3.0.0
*
* @param {ProgressEvent} event - The DOM ProgressEvent.
*/
onProgress: function (event)
{
@ -123,7 +127,11 @@ var HTML5AudioFile = new Class({
if (this.filesLoaded === this.filesTotal)
{
this.onLoad();
var success = !(event.target && event.target.status !== 200);
this.state = CONST.FILE_LOADED;
this.loader.nextFile(this, success);
}
},
@ -148,26 +156,25 @@ var HTML5AudioFile = new Class({
for (var i = 0; i < instances; i++)
{
var audio = new Audio();
var dataset = audio.dataset;
if (!audio.dataset)
{
audio.dataset = {};
}
audio.dataset.name = this.key + ('0' + i).slice(-2);
audio.dataset.used = 'false';
dataset.name = this.key + '-' + i.toString();
dataset.used = 'false';
if (this.locked)
{
audio.dataset.locked = 'true';
dataset.locked = 'true';
console.log('HTML5AudioFile:', dataset.name, 'locked');
}
else
{
audio.dataset.locked = 'false';
dataset.locked = 'false';
audio.preload = 'auto';
audio.oncanplaythrough = this.onProgress.bind(this);
audio.onerror = this.onError.bind(this);
console.log('HTML5AudioFile:', dataset.name, 'unlocked');
}
this.data.push(audio);
@ -176,22 +183,20 @@ var HTML5AudioFile = new Class({
for (i = 0; i < this.data.length; i++)
{
audio = this.data[i];
audio.src = GetURL(this, this.loader.baseURL);
if (!this.locked)
{
audio.load();
console.log('HTML5AudioFile:', dataset.name, 'load called');
}
}
if (this.locked)
{
// This is super-dangerous but works. Race condition potential high.
// Is there another way?
setTimeout(this.onLoad.bind(this));
this.loader.nextFile(this, true);
}
console.log('Audio loaded', this.key);
}
});