From 5ff3d910cab3b8011a84dc420d627bab784e4556 Mon Sep 17 00:00:00 2001
From: cam900 <dbtlrchl@naver.com>
Date: Tue, 13 Dec 2022 14:47:54 +0900
Subject: [PATCH] Sync with master

---
 src/engine/platform/k007232.h | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/engine/platform/k007232.h b/src/engine/platform/k007232.h
index ef035946..3efcb3f3 100644
--- a/src/engine/platform/k007232.h
+++ b/src/engine/platform/k007232.h
@@ -26,15 +26,14 @@
 #include "vgsound_emu/src/k007232/k007232.hpp"
 
 class DivPlatformK007232: public DivDispatch, public k007232_intf {
-  struct Channel {
-    int freq, prevFreq, baseFreq, pitch, pitch2;
+  struct Channel: public SharedChannelFreq, public SharedChannelVolume<int> {
+    int prevFreq;
     unsigned int audPos;
     int prevBank;
-    int sample, wave, ins;
-    int note;
+    int sample;
     int panning, prevPan;
-    bool active, insChanged, volumeChanged, freqChanged, keyOn, keyOff, inPorta, setPos;
-    int vol, outVol, resVol, lvol, rvol;
+    bool volumeChanged, setPos;
+    int resVol, lvol, rvol;
     int macroVolMul;
     DivMacroInt std;
     void macroInit(DivInstrument* which) {
@@ -42,28 +41,16 @@ class DivPlatformK007232: public DivDispatch, public k007232_intf {
       pitch2=0;
     }
     Channel():
-      freq(0),
+      SharedChannelFreq(),
+      SharedChannelVolume<int>(15),
       prevFreq(-1),
-      baseFreq(0),
-      pitch(0),
-      pitch2(0),
       audPos(0),
       prevBank(-1),
       sample(-1),
-      ins(-1),
-      note(0),
       panning(255),
       prevPan(-1),
-      active(false),
-      insChanged(true),
       volumeChanged(false),
-      freqChanged(false),
-      keyOn(false),
-      keyOff(false),
-      inPorta(false),
       setPos(false),
-      vol(15),
-      outVol(15),
       resVol(15),
       lvol(15),
       rvol(15),