From 6aa88b07705e2b618b58045e7478e116d041329e Mon Sep 17 00:00:00 2001 From: cam900 Date: Wed, 8 Jun 2022 10:10:55 +0900 Subject: [PATCH] Move on .cpp, prepare for variable rate support --- src/engine/platform/fmshared_OPN.h | 9 +++------ src/engine/platform/genesis.cpp | 3 +++ src/engine/platform/genesisext.cpp | 3 +++ src/engine/platform/ym2203.cpp | 3 ++- src/engine/platform/ym2203ext.cpp | 3 +++ src/engine/platform/ym2608.cpp | 3 ++- src/engine/platform/ym2608ext.cpp | 3 +++ src/engine/platform/ym2610.cpp | 2 ++ src/engine/platform/ym2610b.cpp | 3 +++ src/engine/platform/ym2610bext.cpp | 3 +++ src/engine/platform/ym2610ext.cpp | 3 +++ 11 files changed, 30 insertions(+), 8 deletions(-) diff --git a/src/engine/platform/fmshared_OPN.h b/src/engine/platform/fmshared_OPN.h index 7632e78f7..74e13219f 100644 --- a/src/engine/platform/fmshared_OPN.h +++ b/src/engine/platform/fmshared_OPN.h @@ -22,9 +22,6 @@ #include "fmsharedbase.h" -#define CHIP_FREQBASE fmFreqBase -#define CHIP_DIVIDER fmDivBase - #define PLEASE_HELP_ME(_targetChan) \ int boundaryBottom=parent->calcBaseFreq(chipClock,CHIP_FREQBASE,0,false); \ int boundaryTop=parent->calcBaseFreq(chipClock,CHIP_FREQBASE,12,false); \ @@ -104,9 +101,9 @@ class DivPlatformOPN: public DivPlatformFMBase { 0x00, 0x04, 0x08, 0x0c }; - const double fmFreqBase; - const double fmDivBase; - const unsigned char ayDiv; + double fmFreqBase; + double fmDivBase; + unsigned char ayDiv; DivPlatformOPN(double f=9440540.0, double d=72, unsigned char a=32): DivPlatformFMBase(), diff --git a/src/engine/platform/genesis.cpp b/src/engine/platform/genesis.cpp index b9a5c6866..b3afdd2a3 100644 --- a/src/engine/platform/genesis.cpp +++ b/src/engine/platform/genesis.cpp @@ -22,6 +22,9 @@ #include #include +#define CHIP_FREQBASE fmFreqBase +#define CHIP_DIVIDER fmDivBase + #define IS_REALLY_MUTED(x) (isMuted[x] && (x<5 || !softPCM || (isMuted[5] && isMuted[6]))) const char* DivPlatformGenesis::getEffectName(unsigned char effect) { diff --git a/src/engine/platform/genesisext.cpp b/src/engine/platform/genesisext.cpp index 057049eaa..cd4d603c1 100644 --- a/src/engine/platform/genesisext.cpp +++ b/src/engine/platform/genesisext.cpp @@ -21,6 +21,9 @@ #include "../engine.h" #include +#define CHIP_FREQBASE fmFreqBase +#define CHIP_DIVIDER fmDivBase + int DivPlatformGenesisExt::dispatch(DivCommand c) { if (c.chan<2) { return DivPlatformGenesis::dispatch(c); diff --git a/src/engine/platform/ym2203.cpp b/src/engine/platform/ym2203.cpp index 42314615b..a25c0e964 100644 --- a/src/engine/platform/ym2203.cpp +++ b/src/engine/platform/ym2203.cpp @@ -23,7 +23,8 @@ #include #include - +#define CHIP_FREQBASE fmFreqBase +#define CHIP_DIVIDER fmDivBase const char* regCheatSheetYM2203[]={ // SSG diff --git a/src/engine/platform/ym2203ext.cpp b/src/engine/platform/ym2203ext.cpp index fbef7b043..d3fd3487b 100644 --- a/src/engine/platform/ym2203ext.cpp +++ b/src/engine/platform/ym2203ext.cpp @@ -21,6 +21,9 @@ #include "../engine.h" #include +#define CHIP_FREQBASE fmFreqBase +#define CHIP_DIVIDER fmDivBase + int DivPlatformYM2203Ext::dispatch(DivCommand c) { if (c.chan<2) { return DivPlatformYM2203::dispatch(c); diff --git a/src/engine/platform/ym2608.cpp b/src/engine/platform/ym2608.cpp index 875f4148d..46b8b0ad1 100644 --- a/src/engine/platform/ym2608.cpp +++ b/src/engine/platform/ym2608.cpp @@ -24,7 +24,8 @@ #include #include - +#define CHIP_FREQBASE fmFreqBase +#define CHIP_DIVIDER fmDivBase const char* regCheatSheetYM2608[]={ // SSG diff --git a/src/engine/platform/ym2608ext.cpp b/src/engine/platform/ym2608ext.cpp index d33bf9edb..91c3a897f 100644 --- a/src/engine/platform/ym2608ext.cpp +++ b/src/engine/platform/ym2608ext.cpp @@ -21,6 +21,9 @@ #include "../engine.h" #include +#define CHIP_FREQBASE fmFreqBase +#define CHIP_DIVIDER fmDivBase + int DivPlatformYM2608Ext::dispatch(DivCommand c) { if (c.chan<2) { return DivPlatformYM2608::dispatch(c); diff --git a/src/engine/platform/ym2610.cpp b/src/engine/platform/ym2610.cpp index df340804a..bed59c203 100644 --- a/src/engine/platform/ym2610.cpp +++ b/src/engine/platform/ym2610.cpp @@ -24,6 +24,8 @@ #include #include +#define CHIP_FREQBASE fmFreqBase +#define CHIP_DIVIDER fmDivBase const char* regCheatSheetYM2610[]={ // SSG diff --git a/src/engine/platform/ym2610b.cpp b/src/engine/platform/ym2610b.cpp index 16f198f7e..a2291c3f4 100644 --- a/src/engine/platform/ym2610b.cpp +++ b/src/engine/platform/ym2610b.cpp @@ -23,6 +23,9 @@ #include #include +#define CHIP_FREQBASE fmFreqBase +#define CHIP_DIVIDER fmDivBase + const char* regCheatSheetYM2610B[]={ // SSG "SSG_FreqL_A", "000", diff --git a/src/engine/platform/ym2610bext.cpp b/src/engine/platform/ym2610bext.cpp index 61a997895..b5e1ac9fb 100644 --- a/src/engine/platform/ym2610bext.cpp +++ b/src/engine/platform/ym2610bext.cpp @@ -21,6 +21,9 @@ #include "../engine.h" #include +#define CHIP_FREQBASE fmFreqBase +#define CHIP_DIVIDER fmDivBase + int DivPlatformYM2610BExt::dispatch(DivCommand c) { if (c.chan<2) { return DivPlatformYM2610B::dispatch(c); diff --git a/src/engine/platform/ym2610ext.cpp b/src/engine/platform/ym2610ext.cpp index f2006c1cc..6f9c8700d 100644 --- a/src/engine/platform/ym2610ext.cpp +++ b/src/engine/platform/ym2610ext.cpp @@ -21,6 +21,9 @@ #include "../engine.h" #include +#define CHIP_FREQBASE fmFreqBase +#define CHIP_DIVIDER fmDivBase + int DivPlatformYM2610Ext::dispatch(DivCommand c) { if (c.chan<1) { return DivPlatformYM2610::dispatch(c);