From 81c1c206d4f849873b334688c625945053866e85 Mon Sep 17 00:00:00 2001
From: fgsfds <derp.primus@gmail.com>
Date: Sun, 6 Aug 2023 18:20:17 +0200
Subject: [PATCH] port: make audio run at 60hz again but with smaller frames

this is required to tick music events correctly
---
 port/src/pdsched.c |  5 +----
 src/lib/audiomgr.c | 35 +++++++++++++++++++++++++++++++----
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/port/src/pdsched.c b/port/src/pdsched.c
index 77ed28034..b84bdda2a 100644
--- a/port/src/pdsched.c
+++ b/port/src/pdsched.c
@@ -235,13 +235,10 @@ void schedStartFrame(OSSched *sc)
 
 void schedAudioFrame(OSSched *sc)
 {
-	// audio ticks at 30hz
-	static s32 runFrame = 0;
-	if (!g_SndDisabled && runFrame) {
+	if (!g_SndDisabled) {
 		amgrFrame();
 		audioEndFrame();
 	}
-	runFrame ^= 1;
 }
 
 /**
diff --git a/src/lib/audiomgr.c b/src/lib/audiomgr.c
index 5533a0880..80f3d099e 100644
--- a/src/lib/audiomgr.c
+++ b/src/lib/audiomgr.c
@@ -319,16 +319,43 @@ void amgrHandleDoneMsg(AudioInfo *info)
 #ifndef PLATFORM_N64
 void amgrFrame(void)
 {
-	static AudioInfo *prevInfo = NULL;
+	static AudioInfo *previnfo = NULL;
 	static s32 count = 0;
 
 	var80091588 = osGetTime();
 
-	AudioInfo *next = g_AudioManager.audioInfo[g_AdmaCurFrame % 3];
-	amgrHandleFrameMsg(next, prevInfo);
+	AudioInfo *info = g_AudioManager.audioInfo[g_AdmaCurFrame % 3];
+
+	admaBeginFrame();
+
+	const s32 somevalue = osAiGetLength() / 4;
+	Acmd *datastart = g_AudioManager.ACMDList[var8005cf90];
+	s16 *outbuffer = (s16 *) osVirtualToPhysical(info->data);
+
+	if (previnfo) {
+		osAiSetNextBuffer(previnfo->data, previnfo->frameSamples * 4);
+	}
+
+	if (somevalue > 1100 && var8005cf94 == 0) {
+		// already a lot queued, render 1 naudio frame (184 samples) this frame
+		info->frameSamples = 184;
+		var8005cf94 = 2;
+	} else {
+		// have space in audio queue, render 2 naudio frames this frame
+		info->frameSamples = 368;
+
+		if (var8005cf94 != 0) {
+			var8005cf94--;
+		}
+	}
+
+	Acmd *cmd = n_alAudioFrame(datastart, &var800918e8, outbuffer, info->frameSamples);
+
+	var8005cf90 ^= 1;
+
 	admaReceiveAll();
 
-	prevInfo = next;
+	previnfo = info;
 
 	count++;