Tweak Sound Playback Codes

Raltyro · Raltyro · commit b44d608aade2 · 2026-02-14T11:39:26.000+07:00
diff --git a/source/funkin/audio/FunkinSound.hx b/source/funkin/audio/FunkinSound.hx
@@ -309,8 +309,7 @@ class FunkinSound extends FlxSound implements ICloneable<FunkinSound>
     if (FlxG.sound.music != null)
     {
       FlxG.sound.music.fadeTween?.cancel();
-      FlxG.sound.music.stop();
-      FlxG.sound.music.kill();
+      FlxG.sound.music.destroy();
     }
 
     if (params?.mapTimeChanges ?? true)
@@ -345,27 +344,18 @@ class FunkinSound extends FlxSound implements ICloneable<FunkinSound>
 
     if (shouldLoadPartial)
     {
-      var music = FunkinSound.loadPartial(pathToUse, params.partialParams?.start ?? 0.0, params.partialParams?.end ?? 1.0, params?.startingVolume ?? 1.0,
+      var promise = FunkinSound.loadPartial(pathToUse, params.partialParams?.start ?? 0.0, params.partialParams?.end ?? 1.0, params?.startingVolume ?? 1.0,
         params.loop ?? true, false, false, params.onComplete);
 
-      if (music != null)
-      {
-        partialQueue.push(music);
+      partialQueue.push(promise);
 
-        @:nullSafety(Off)
-        music.future.onComplete(function(partialMusic:Null<FunkinSound>) {
-          FlxG.sound.music = partialMusic;
-          FlxG.sound.list.remove(FlxG.sound.music);
-
-          if (FlxG.sound.music != null && params.onLoad != null) params.onLoad();
-        });
+      @:nullSafety(Off)
+      promise.future.onComplete(function(partialMusic:Null<FunkinSound>) {
+        setMusic(partialMusic);
+        if (partialMusic != null && params.onLoad != null) params.onLoad();
+      });
 
-        return true;
-      }
-      else
-      {
-        return false;
-      }
+      return true;
     }
     else
     {
@@ -511,8 +501,8 @@ class FunkinSound extends FlxSound implements ICloneable<FunkinSound>
 
   override function get_playing():Bool
   {
-    return super.get_playing() || this._shouldPlay;
-    }
+    return loaded && (source.playing || _pausedPlay || _shouldPlay);
+  }
 
   override function get_time():Float
   {
diff --git a/source/funkin/audio/SoundGroup.hx b/source/funkin/audio/SoundGroup.hx
@@ -1,14 +1,13 @@
 package funkin.audio;
 
-import lime.media.AudioSource;
 import flixel.group.FlxGroup.FlxTypedGroup;
+import flixel.sound.FlxSound;
 import flixel.tweens.FlxTween;
 
 /**
  * A group of FunkinSounds that are all synced together.
  * Unlike FlxSoundGroup, you can also control their time and pitch.
  */
-@:access(flixel.sound.FlxSound)
 @:access(funkin.audio.FunkinSound)
 @:nullSafety
 class SoundGroup extends FlxTypedGroup<FunkinSound>
@@ -106,71 +105,47 @@ class SoundGroup extends FlxTypedGroup<FunkinSound>
    */
   public function pause()
   {
-    forEachAlive(function(sound:FunkinSound) {
-      sound.pause();
-    });
+    if (members != null) FlxSound.pauseSounds(cast members);
   }
 
   /**
    * Play all the sounds in the group.
    */
   public function play(forceRestart:Bool = false, startTime:Float = 0.0, ?endTime:Float)
   {
-    var sources:Array<AudioSource> = [];
+    var sounds:Array<FlxSound> = [];
 
     forEachAlive(function(sound:FunkinSound) {
       if (sound.playing && !forceRestart || sound.length < startTime)
       {
         return;
       }
 
-      if (sound._pausedByHandler)
-      {
-        sound.play(true, startTime, endTime);
-      }
-      else
-      {
-        sound.prepare(startTime, endTime);
-        sources.push(sound.source);
-
-        sound._paused = false;
-        sound._completed = false;
-        sound.active = true;
-      }
+      sound.prepare(startTime, endTime);
+      sounds.push(sound);
     });
 
-    AudioSource.playSources(sources);
+    FlxSound.playSounds(sounds);
   }
 
   /**
    * Resume all the sounds in the group.
    */
   public function resume()
   {
-    var sources:Array<AudioSource> = [];
+    var sounds:Array<FlxSound> = [];
 
     forEachAlive(function(sound:FunkinSound) {
       if (sound.playing || !sound._paused)
       {
         return;
       }
 
-      if (sound._pausedByHandler)
-      {
-        sound.resume();
-      }
-      else
-      {
-        sound.prepare(sound.time);
-        sources.push(sound.source);
-
-        sound._paused = false;
-        sound._completed = false;
-        sound.active = true;
-      }
+      sound.prepare(sound.time);
+      sounds.push(sound);
     });
 
-    AudioSource.playSources(sources);
+    FlxSound.playSounds(sounds);
   }
 
   /**
@@ -200,12 +175,7 @@ class SoundGroup extends FlxTypedGroup<FunkinSound>
    */
   public function stop():Void
   {
-    if (members != null)
-    {
-      forEachAlive(function(sound:FunkinSound) {
-        sound.stop();
-      });
-    }
+    if (members != null) FlxSound.stopSounds(cast members);
   }
 
   public override function destroy():Void
@@ -241,30 +211,19 @@ class SoundGroup extends FlxTypedGroup<FunkinSound>
   {
     // account for different offsets per sound?
 
-    var sources:Array<AudioSource> = [];
+    var sounds:Array<FlxSound> = [];
 
     forEachAlive(function(sound:FunkinSound) {
-      if (!sound.loaded || sound.length < time)
+      if (!sound.loaded || sound.length < time || !sound.playing)
       {
         return;
       }
 
-      if (sound._pausedByHandler || !sound.source.playing)
-      {
-        sound.time = time;
-      }
-      else
-      {
-        sound.prepare(time);
-        sources.push(sound.source);
-
-        sound._paused = false;
-        sound._completed = false;
-        sound.active = true;
-      }
+      sound.prepare(time);
+      sounds.push(sound);
     });
 
-    AudioSource.playSources(sources);
+    FlxSound.playSounds(sounds);
 
     return time;
   }
diff --git a/source/funkin/audio/VoicesGroup.hx b/source/funkin/audio/VoicesGroup.hx
@@ -1,10 +1,9 @@
 package funkin.audio;
 
-import lime.media.AudioSource;
 import flixel.group.FlxGroup.FlxTypedGroup;
+import flixel.sound.FlxSound;
 import funkin.audio.waveform.WaveformData;
 
-@:access(flixel.sound.FlxSound)
 @:access(funkin.audio.FunkinSound)
 @:nullSafety
 class VoicesGroup extends SoundGroup
@@ -56,39 +55,47 @@ class VoicesGroup extends SoundGroup
     return playerVolume = volume;
   }
 
-  override function set_time(time:Float):Float
+  override function play(forceRestart:Bool = false, startTime:Float = 0.0, ?endTime:Float)
   {
-    // account for different offsets per sound?
-
-    var sources:Array<AudioSource> = [];
+    var sounds:Array<FlxSound> = [];
 
     forEachAlive(function(sound:FunkinSound) {
-      var localTime = time;
+      var localTime = startTime;
 
       if (playerVoices?.members.contains(sound) ?? false) localTime -= playerVoicesOffset;
       else if (opponentVoices?.members.contains(sound) ?? false) localTime -= opponentVoicesOffset;
 
-      if (!sound.loaded || sound.length < localTime)
+      if (sound.playing && !forceRestart || sound.length < localTime)
       {
         return;
       }
 
-      if (sound._pausedByHandler || !sound.source.playing)
-      {
-        sound.time = localTime;
-      }
-      else
-      {
-        sound.prepare(localTime);
-        sources.push(sound.source);
+      sound.prepare(localTime, endTime);
+      sounds.push(sound);
+    });
 
-        sound._paused = false;
-        sound._completed = false;
-        sound.active = true;
-      }
+    FlxSound.playSounds(sounds);
+  }
+
+  override function set_time(time:Float):Float
+  {
+    // account for different offsets per sound?
+
+    var sounds:Array<FlxSound> = [];
+
+    forEachAlive(function(sound:FunkinSound) {
+      var localTime = time;
+
+      if (playerVoices?.members.contains(sound) ?? false) localTime -= playerVoicesOffset;
+      else if (opponentVoices?.members.contains(sound) ?? false) localTime -= opponentVoicesOffset;
+
+      if (!sound.loaded || sound.length < localTime || !sound.playing) return;
+
+      sound.prepare(localTime);
+      sounds.push(sound);
     });
 
-    AudioSource.playSources(sources);
+    FlxSound.playSounds(sounds);
 
     return time;
   }
diff --git a/source/funkin/play/GameOverSubState.hx b/source/funkin/play/GameOverSubState.hx
@@ -144,6 +144,8 @@ class GameOverSubState extends MusicBeatSubState
 
     parentPlayState = cast _parentState;
 
+    gameOverMusic = FunkinSound.load(null);
+
     //
     // Set up the visuals
     //
@@ -509,10 +511,11 @@ class GameOverSubState extends MusicBeatSubState
     }
     else if (gameOverMusic == null || !gameOverMusic.playing || force)
     {
-      if (gameOverMusic != null) gameOverMusic.stop();
-
-      gameOverMusic = FunkinSound.load(musicPath);
-      if (gameOverMusic == null) return;
+      if (gameOverMusic == null) gameOverMusic = FunkinSound.load(musicPath);
+      {
+        gameOverMusic.stop();
+        gameOverMusic.loadEmbedded(musicPath);
+      }
 
       gameOverMusic.volume = startingVolume;
       gameOverMusic.looped = !(isEnding || isStarting);
diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
@@ -1828,12 +1828,12 @@ class PlayState extends MusicBeatSubState
         @:privateAccess // todo: maybe make the groups public :thinking:
         {
           vocals.playerVoices?.forEachAlive(function(voice:FunkinSound) {
-            var currentRawVoiceTime:Float = voice.getActualTime() + vocals.playerVoicesOffset;
+            var currentRawVoiceTime:Float = voice.getActualTime() + vocals.playerVoicesOffset + Conductor.instance.instrumentalOffset;
             if (Math.abs(currentRawVoiceTime - correctSync) > Math.abs(playerVoicesError) && voice.playing) playerVoicesError = currentRawVoiceTime - correctSync;
           });
 
           vocals.opponentVoices?.forEachAlive(function(voice:FunkinSound) {
-            var currentRawVoiceTime:Float = voice.getActualTime() + vocals.opponentVoicesOffset;
+            var currentRawVoiceTime:Float = voice.getActualTime() + vocals.opponentVoicesOffset + Conductor.instance.instrumentalOffset;
             if (Math.abs(currentRawVoiceTime - correctSync) > Math.abs(opponentVoicesError) && voice.playing) opponentVoicesError = currentRawVoiceTime - correctSync;
           });
         }
@@ -2557,21 +2557,15 @@ class PlayState extends MusicBeatSubState
 
     if (vocals != null)
     {
-      trace('Playing vocals...');
       add(vocals);
 
       vocals.pitch = playbackRate;
       vocals.playerVolume = playerVocalsVolume;
       vocals.opponentVolume = opponentVocalsVolume;
-
-      // trace('STARTING SONG AT:');
-      // trace('${FlxG.sound.music.time}');
-      // trace('${vocals.time}');
-
-      vocals.play(true, startTimestamp - Conductor.instance.instrumentalOffset);
     }
 
-    FlxG.sound.music.play(true, startTimestamp);
+    Conductor.instance.update(startTimestamp);
+    resyncVocals(true);
 
     #if FEATURE_DISCORD_RPC
     // Updating Discord Rich Presence (with Time Left)
@@ -2606,12 +2600,26 @@ class PlayState extends MusicBeatSubState
   {
     if (FlxG.sound.music != null && force || (vocals != null && FlxG.sound.music.playing))
     {
-      var timeToPlayAt:Float = Math.min(FlxG.sound.music.length,
-        Math.max(Math.min(Conductor.instance.combinedOffset, 0), Conductor.instance.songPosition) - Conductor.instance.combinedOffset);
+      var timeToPlayAt:Float = (Conductor.instance.songPosition - Conductor.instance.combinedOffset).clamp(0, FlxG.sound.music.length);
       trace('Resyncing vocals to ${timeToPlayAt}');
 
-      FlxG.sound.music.play(true, timeToPlayAt);
-      vocals?.play(true, timeToPlayAt);
+      //FlxG.sound.music.play(true, timeToPlayAt);
+      //vocals?.play(true, timeToPlayAt - Conductor.instance.instrumentalOffset);
+
+      var sounds:Array<FlxSound> = [FlxG.sound.music];
+
+      FlxG.sound.music.prepare(timeToPlayAt);
+      if (vocals != null)
+      {
+        var vocalsTimeToPlayAt:Float = timeToPlayAt - Conductor.instance.instrumentalOffset;
+        vocals.forEachAlive(function(sound:FunkinSound)
+        {
+          sounds.push(sound);
+          sound.prepare(vocalsTimeToPlayAt);
+        });
+      }
+
+      FlxSound.playSounds(sounds);
     }
   }
 
