From 2f9a6b7c0346c31cbed34a006174d9a9b4efb79e Mon Sep 17 00:00:00 2001
From: Arisotura <thetotalworm@gmail.com>
Date: Thu, 23 Jul 2020 12:59:19 +0200
Subject: [PATCH] SPU: delay channel start until whenever it can actually
 start. fixes maxmod interpolated mode.

---
 src/NDS.cpp | 2 +-
 src/SPU.cpp | 9 +++++++++
 src/SPU.h   | 3 ++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/NDS.cpp b/src/NDS.cpp
index 8cd7f934..2ad6badc 100644
--- a/src/NDS.cpp
+++ b/src/NDS.cpp
@@ -493,7 +493,7 @@ void Reset()
         printf("ARM7 BIOS loaded\n");
         fclose(f);
     }
-    
+
 #ifdef JIT_ENABLED
     ARMJIT::Reset();
 #endif
diff --git a/src/SPU.cpp b/src/SPU.cpp
index 9f6b1072..cd5c5b81 100644
--- a/src/SPU.cpp
+++ b/src/SPU.cpp
@@ -160,6 +160,8 @@ void Channel::Reset()
     else
         BusRead32 = NDS::ARM7Read32;
 
+    KeyOn = false;
+
     SetCnt(0);
     SrcAddr = 0;
     TimerReload = 0;
@@ -187,6 +189,7 @@ void Channel::DoSavestate(Savestate* file)
     file->Var8(&VolumeShift);
     file->Var8(&Pan);
 
+    file->Var8((u8*)&KeyOn);
     file->Var32(&Timer);
     file->Var32((u32*)&Pos);
     file->Var16((u16*)&CurSample);
@@ -417,6 +420,12 @@ void Channel::Run(s32* buf, u32 samples)
 {
     if (!(Cnt & (1<<31))) return;
 
+    if (KeyOn)
+    {
+        Start();
+        KeyOn = false;
+    }
+
     for (u32 s = 0; s < samples; s++)
     {
         Timer += 512; // 1 sample = 512 cycles at 16MHz
diff --git a/src/SPU.h b/src/SPU.h
index 8ab17a03..964841d3 100644
--- a/src/SPU.h
+++ b/src/SPU.h
@@ -69,6 +69,7 @@ public:
     u8 VolumeShift;
     u8 Pan;
 
+    bool KeyOn;
     u32 Timer;
     s32 Pos;
     s16 CurSample;
@@ -105,7 +106,7 @@ public:
 
         if ((val & (1<<31)) && !(oldcnt & (1<<31)))
         {
-            Start();
+            KeyOn = true;
         }
     }