cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-07-07 03:18:43 +00:00
Code Issues Releases Wiki Activity

promises + error out partial sounds that attempt to load multiple times

Browse source
This commit is contained in:
Cameron Taylor 2024-05-28 23:53:50 -04:00
parent 01b6a11ddb
commit 2d300039ae
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
source/funkin/audio/FunkinSound.hx
View file

@ -360,24 +360,24 @@ class FunkinSound extends FlxSound implements ICloneable<FunkinSound>
if (shouldLoadPartial) if (shouldLoadPartial)
{ {
var music = FunkinSound.loadPartial(pathToUse, params.partialParams?.start ?? 0, params.partialParams?.end ?? 1, params?.startingVolume ?? 1.0, var music = FunkinSound.loadPartial(pathToUse, params.partialParams?.start ?? 0, params.partialParams?.end ?? 1, params?.startingVolume ?? 1.0,
params.loop ?? true, false, true, params.onComplete, params.onLoad); params.loop ?? true, false, false, params.onComplete);
if (music != null) if (music != null)
{ {
for (future in partialQueue) while (partialQueue.length > 0)
{ {
future = cast Future.withError("Music was overridden by another partial load"); @:nullSafety(Off)
partialQueue.pop().error("Cancel loading partial sound");
} }
partialQueue = [];
partialQueue.push(music); partialQueue.push(music);
@:nullSafety(Off) @:nullSafety(Off)
music.onComplete(function(partialMusic:Null<FunkinSound>) { music.future.onComplete(function(partialMusic:Null<FunkinSound>) {
if (partialQueue.pop() == music) FlxG.sound.music = partialMusic;
{ FlxG.sound.list.remove(FlxG.sound.music);
FlxG.sound.music = partialMusic;
FlxG.sound.list.remove(FlxG.sound.music); if (params.onLoad != null) params.onLoad();
}
}); });
return true; return true;
@ -406,7 +406,7 @@ class FunkinSound extends FlxSound implements ICloneable<FunkinSound>
} }
} }
static var partialQueue:Array<Future<Null<FunkinSound>>> = []; static var partialQueue:Array<Promise<Null<FunkinSound>>> = [];
/** /**
* Creates a new `FunkinSound` object synchronously. * Creates a new `FunkinSound` object synchronously.
@ -478,7 +478,7 @@ class FunkinSound extends FlxSound implements ICloneable<FunkinSound>
* @return A FunkinSound object * @return A FunkinSound object
*/ */
public static function loadPartial(path:String, start:Float = 0, end:Float = 1, volume:Float = 1.0, looped:Bool = false, autoDestroy:Bool = false, public static function loadPartial(path:String, start:Float = 0, end:Float = 1, volume:Float = 1.0, looped:Bool = false, autoDestroy:Bool = false,
autoPlay:Bool = true, ?onComplete:Void->Void, ?onLoad:Void->Void):Future<Null<FunkinSound>> autoPlay:Bool = true, ?onComplete:Void->Void, ?onLoad:Void->Void):Promise<Null<FunkinSound>>
{ {
var promise:lime.app.Promise<Null<FunkinSound>> = new lime.app.Promise<Null<FunkinSound>>(); var promise:lime.app.Promise<Null<FunkinSound>> = new lime.app.Promise<Null<FunkinSound>>();
@ -488,12 +488,16 @@ class FunkinSound extends FlxSound implements ICloneable<FunkinSound>
var soundRequest = FlxPartialSound.partialLoadFromFile(path, start, end); var soundRequest = FlxPartialSound.partialLoadFromFile(path, start, end);
soundRequest.onComplete(function(partialSound) { promise.future.onError(function(e) {
soundRequest.error("Sound loading was errored or cancelled");
});
soundRequest.future.onComplete(function(partialSound) {
var snd = FunkinSound.load(partialSound, volume, looped, autoDestroy, autoPlay, onComplete, onLoad); var snd = FunkinSound.load(partialSound, volume, looped, autoDestroy, autoPlay, onComplete, onLoad);
promise.complete(snd); promise.complete(snd);
}); });
return promise.future; return promise;
} }
@:nullSafety(Off) @:nullSafety(Off)