Second Hotfix of Second Release #2

Raltyro · Feb 27, 2023 · c1b7793 · c1b7793
1 parent f11ec9e
commit c1b7793
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/source/PlayState.hx b/source/PlayState.hx
@@ -2880,7 +2880,7 @@ class PlayState extends MusicBeatState {
 
 	function resyncVocals(resync:Bool = true):Void {
 		if (finishTimer != null || (transitioning && endingSong)) return;
-		var dt = (FlxG.game.ticks - previousFrameTime) * getActualPlaybackRate(), prev = Conductor.songPosition;
+		var prev = Conductor.songPosition;
 		FlxG.sound.music.pitch = playbackRate;
 
 		if (Conductor.songPosition <= vocals.length) {
@@ -2892,18 +2892,18 @@ class PlayState extends MusicBeatState {
 					FlxG.sound.music.pause();
 					vocals.pause();
 				}
-				Conductor.songPosition = vocals.time = FlxG.sound.music.time;
+				Conductor.songPosition = (lastSongTime = vocals.time = FlxG.sound.music.time) + Conductor.offset;
 			}
 			else
-				Conductor.songPosition = FlxG.sound.music.time + Conductor.offset;
+				Conductor.songPosition = lastSongTime + Conductor.offset;
 
 			vocals.play();
 		}
 		else
-			Conductor.songPosition = FlxG.sound.music.time + Conductor.offset;
+			Conductor.songPosition = lastSongTime + Conductor.offset;
 
 		var diff = prev - Conductor.songPosition;
-		if (diff < dt / 2 && diff >= 0) Conductor.songPosition = prev;
+		if (diff < songElapsed && diff >= 0) Conductor.songPosition = prev;
 		FlxG.sound.music.play();
 	}
 
@@ -2913,6 +2913,7 @@ class PlayState extends MusicBeatState {
 	var canPause:Bool = true;
 	var limoSpeed:Float = 0;
 	var lastSongTime:Float = 0;
+	var songElapsed:Float = 0;
 
 	override function update(elapsed:Float) {
 		/*if (FlxG.keys.justPressed.NINE) {
@@ -2938,13 +2939,14 @@ class PlayState extends MusicBeatState {
 
 		if (startedCountdown) {
 			var dt = elapsed * 1000 * playbackRate;
-			if (!startingSong && FlxG.sound.music.playing) {
-				var ticks = FlxG.sound.music.time - lastSongTime;
-				lastSongTime = FlxG.sound.music.time;
-				if (ticks < dt && ticks > 0) dt = ticks;
-			}
-
 			Conductor.songPosition += dt;
+
+			if (FlxG.sound.music.playing) {
+				var time = FlxG.sound.music.time;
+				songElapsed = time - lastSongTime;
+				lastSongTime = time;
+				if (!startingSong && songElapsed > 0) Conductor.songPosition = time;
+			}
 		}
 
 		if (!inCutscene) {
@@ -4833,7 +4835,7 @@ class PlayState extends MusicBeatState {
 
 		if (!paused && !startingSong) {
 			var resync:Bool = vocals.loaded && Math.abs(vocals.time - FlxG.sound.music.time) > (vocals.vorbis == null ? 6 : 12);
-			if (Math.abs(FlxG.sound.music.time - (Conductor.songPosition - Conductor.offset)) > 6 || resync)
+			if ((songElapsed <= 0 && Math.abs(lastSongTime - (Conductor.songPosition - Conductor.offset)) > 16) || resync)
 				resyncVocals(resync);
 		}
 

diff --git a/source/lime/_internal/backend/native/NativeAudioSource.hx b/source/lime/_internal/backend/native/NativeAudioSource.hx
@@ -277,8 +277,10 @@ class NativeAudioSource {
 			var time;
 			if (stream) time = (bufferTimeBlocks[STREAM_NUM_BUFFERS - queuedBuffers] + AL.getSourcef(handle, AL.SEC_OFFSET)) * 1000;
 			else time = samples / parent.buffer.sampleRate * (AL.getSourcei(handle, AL.BYTE_OFFSET) / dataLength) * 1000;
+			time -= parent.offset;
+			time %= inline getLength() + 1;
 
-			if ((time -= parent.offset) > 0) return time;
+			if (time > 0) return time;
 		}
 		return 0;
 	}