From 778d8d84d1fc81e3f79daa41676e7b9454177954 Mon Sep 17 00:00:00 2001 From: tildearrow Date: Tue, 13 Dec 2022 13:23:48 -0500 Subject: [PATCH] minor fixes --- src/engine/chipUtils.h | 3 +-- src/engine/platform/mmc5.h | 4 +--- src/engine/platform/msm6295.h | 3 ++- src/engine/platform/nes.h | 4 +--- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/engine/chipUtils.h b/src/engine/chipUtils.h index fb18b0d22..814935e61 100644 --- a/src/engine/chipUtils.h +++ b/src/engine/chipUtils.h @@ -27,8 +27,7 @@ #define MAX_CUSTOM_CLOCK 40000000 // common shared channel struct -template -struct SharedChannel { +template struct SharedChannel { int freq, baseFreq, pitch, pitch2; int ins, note; bool active, insChanged, freqChanged, keyOn, keyOff, portaPause, inPorta; diff --git a/src/engine/platform/mmc5.h b/src/engine/platform/mmc5.h index 4d250405d..a3ab90538 100644 --- a/src/engine/platform/mmc5.h +++ b/src/engine/platform/mmc5.h @@ -27,15 +27,13 @@ class DivPlatformMMC5: public DivDispatch { int prevFreq; unsigned char duty, sweep; bool sweepChanged, furnaceDac; - signed short wave; Channel(): SharedChannel(15), prevFreq(65535), duty(0), sweep(8), sweepChanged(false), - furnaceDac(false), - wave(-1) {} + furnaceDac(false) {} }; Channel chan[5]; DivDispatchOscBuffer* oscBuf[3]; diff --git a/src/engine/platform/msm6295.h b/src/engine/platform/msm6295.h index 60505515e..e3339df31 100644 --- a/src/engine/platform/msm6295.h +++ b/src/engine/platform/msm6295.h @@ -91,7 +91,8 @@ class DivPlatformMSM6295: public DivDispatch, public vgsound_emu_mem_intf { virtual int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags) override; virtual void quit() override; - DivPlatformMSM6295():DivDispatch(), + DivPlatformMSM6295(): + DivDispatch(), vgsound_emu_mem_intf(), msm(*this) {} ~DivPlatformMSM6295(); diff --git a/src/engine/platform/nes.h b/src/engine/platform/nes.h index aab795841..d9f43e915 100644 --- a/src/engine/platform/nes.h +++ b/src/engine/platform/nes.h @@ -29,7 +29,6 @@ class DivPlatformNES: public DivDispatch { int prevFreq; unsigned char duty, sweep, envMode, len; bool sweepChanged, furnaceDac; - signed short wave; Channel(): SharedChannel(15), prevFreq(65535), @@ -38,8 +37,7 @@ class DivPlatformNES: public DivDispatch { envMode(3), len(0x1f), sweepChanged(false), - furnaceDac(false), - wave(-1) {} + furnaceDac(false) {} }; Channel chan[5]; DivDispatchOscBuffer* oscBuf[5];