From 88b34f2281950eec25826a07374a95bf7406a547 Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Thu, 17 Aug 2023 20:29:58 -0600 Subject: [PATCH] leave sound looping to hollywoo core --- src/hollywoo_flixel/FlxDirector.kiss | 3 --- src/hollywoo_flixel/FlxMovie.hx | 1 - src/hollywoo_flixel/HollywooFlixelDSL.kiss | 12 +----------- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/hollywoo_flixel/FlxDirector.kiss b/src/hollywoo_flixel/FlxDirector.kiss index 919be0b..ddee1bd 100644 --- a/src/hollywoo_flixel/FlxDirector.kiss +++ b/src/hollywoo_flixel/FlxDirector.kiss @@ -611,9 +611,6 @@ (sound.play)) (method :Void stopSound [:FlxSound sound] - (when (flxMovie.loopingOnCompletes.exists sound) - ((dictGet flxMovie.loopingOnCompletes sound)) - (flxMovie.loopingOnCompletes.remove sound)) (currentSounds.remove sound) (sound.stop)) diff --git a/src/hollywoo_flixel/FlxMovie.hx b/src/hollywoo_flixel/FlxMovie.hx index 61ee825..c32395e 100644 --- a/src/hollywoo_flixel/FlxMovie.hx +++ b/src/hollywoo_flixel/FlxMovie.hx @@ -39,7 +39,6 @@ class FlxMovie extends Movie> = []; public var tweens:Array = []; - public var loopingOnCompletes:MapVoid> = []; public var STAGE_LEFT_X:Float; public var STAGE_RIGHT_X:Float; public var ACTOR_WIDTH:Int; diff --git a/src/hollywoo_flixel/HollywooFlixelDSL.kiss b/src/hollywoo_flixel/HollywooFlixelDSL.kiss index 8f921eb..0ddaef7 100644 --- a/src/hollywoo_flixel/HollywooFlixelDSL.kiss +++ b/src/hollywoo_flixel/HollywooFlixelDSL.kiss @@ -58,7 +58,7 @@ (let [oldCC cc] (set cc (makeCC - (stopSound skipping soundLoop (makeCC null)) + (stopLoopingSound skipping (makeCC null)) (when oldCC (oldCC))))) (loopSound skipping soundLoop (makeCC null) volumeMod)) @@ -238,16 +238,6 @@ (when delayWhileShown (cc))))) (unless delayWhileShown (cc))) -(method loopSound [:Bool skipping name :Void->Void cc &opt :Float volumeMod] - (playSound skipping name (makeCC null) volumeMod false) - (let [cs flxDirector.currentSounds - sound (nth cs (- cs.length 1)) - onComplete sound.onComplete] - (dictSet loopingOnCompletes sound onComplete) - (set sound.onComplete null) - (set sound.looped true)) - (cc)) - (method putPresetPosition [key x y z] (let [pos (new StagePosition (Std.int x) (Std.int y) (Std.int z))] (stagePositions.put key pos)