From 1a80fb262d7bece3eab9ab68181abd518901d08c Mon Sep 17 00:00:00 2001
From: tildearrow <me@tildearrow.org>
Date: Sat, 11 Mar 2023 01:42:13 -0500
Subject: [PATCH] Amiga: better emulation, part 6

---
 src/engine/platform/amiga.cpp |  4 ++--
 src/engine/platform/amiga.h   | 12 ------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/engine/platform/amiga.cpp b/src/engine/platform/amiga.cpp
index 37c984039..1eb05b814 100644
--- a/src/engine/platform/amiga.cpp
+++ b/src/engine/platform/amiga.cpp
@@ -338,7 +338,6 @@ void DivPlatformAmiga::tick(bool sysTick) {
       if (chan[i].wave!=chan[i].std.wave.val || chan[i].ws.activeChanged()) {
         chan[i].wave=chan[i].std.wave.val;
         chan[i].ws.changeWave1(chan[i].wave);
-        if (!chan[i].keyOff) chan[i].keyOn=true;
       }
     }
     if (chan[i].useWave && chan[i].active) {
@@ -585,7 +584,8 @@ void DivPlatformAmiga::forceIns() {
     chan[i].insChanged=true;
     chan[i].freqChanged=true;
     chan[i].audPos=131072;
-    chan[i].audDat=0;
+    chan[i].keyOn=false;
+    chan[i].keyOff=false;
     chan[i].sample=-1;
   }
 }
diff --git a/src/engine/platform/amiga.h b/src/engine/platform/amiga.h
index 4e02e7473..db9c2b65b 100644
--- a/src/engine/platform/amiga.h
+++ b/src/engine/platform/amiga.h
@@ -26,33 +26,21 @@
 
 class DivPlatformAmiga: public DivDispatch {
   struct Channel: public SharedChannel<signed char> {
-    unsigned int audLoc;
     unsigned short audLen;
     unsigned int audPos;
-    unsigned int dmaLoc;
-    unsigned short dmaLen;
     int audSub;
-    signed char audDat;
-    signed char audDat2;
     unsigned char volPos;
     int sample, wave;
-    int busClock;
     bool useWave, setPos, useV, useP, dmaOn, audDatClock, writeVol;
     DivWaveSynth ws;
     Channel():
       SharedChannel<signed char>(64),
-      audLoc(0),
       audLen(0),
       audPos(0),
-      dmaLoc(0),
-      dmaLen(0),
       audSub(0),
-      audDat(0),
-      audDat2(0),
       volPos(0),
       sample(-1),
       wave(-1),
-      busClock(0),
       useWave(false),
       setPos(false),
       useV(false),