From ad6fd1561f5a40cdc197081c01da8a4e94860411 Mon Sep 17 00:00:00 2001
From: cam900 <dbtlrchl@naver.com>
Date: Wed, 14 Dec 2022 14:11:08 +0900
Subject: [PATCH] Sync with master

---
 src/engine/platform/k007232.h | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/engine/platform/k007232.h b/src/engine/platform/k007232.h
index 3efcb3f35..6e020f9d8 100644
--- a/src/engine/platform/k007232.h
+++ b/src/engine/platform/k007232.h
@@ -26,7 +26,7 @@
 #include "vgsound_emu/src/k007232/k007232.hpp"
 
 class DivPlatformK007232: public DivDispatch, public k007232_intf {
-  struct Channel: public SharedChannelFreq, public SharedChannelVolume<int> {
+  struct Channel: public SharedChannel<int> {
     int prevFreq;
     unsigned int audPos;
     int prevBank;
@@ -35,14 +35,8 @@ class DivPlatformK007232: public DivDispatch, public k007232_intf {
     bool volumeChanged, setPos;
     int resVol, lvol, rvol;
     int macroVolMul;
-    DivMacroInt std;
-    void macroInit(DivInstrument* which) {
-      std.init(which);
-      pitch2=0;
-    }
     Channel():
-      SharedChannelFreq(),
-      SharedChannelVolume<int>(15),
+      SharedChannel<int>(15),
       prevFreq(-1),
       audPos(0),
       prevBank(-1),