From 319d02aec66fd1dafde5daca147ae69719ae4e1c Mon Sep 17 00:00:00 2001 From: tildearrow Date: Tue, 15 Nov 2022 03:14:26 -0500 Subject: [PATCH] SAA1099: fix frequency table going crazy if there is more than one SAA --- extern/SAASound/src/SAAFreq.cpp | 12 ------------ extern/SAASound/src/SAAFreq.h | 4 ++-- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/extern/SAASound/src/SAAFreq.cpp b/extern/SAASound/src/SAAFreq.cpp index 0058c35a..5d0dd952 100755 --- a/extern/SAASound/src/SAAFreq.cpp +++ b/extern/SAASound/src/SAAFreq.cpp @@ -12,18 +12,6 @@ #include "SAAFreq.h" #include "defns.h" -#ifdef SAAFREQ_FIXED_CLOCKRATE -// 'load in' the data for the static frequency lookup table -// precomputed for a fixed clockrate -// See: tools/freqdat.py -const unsigned long CSAAFreq::m_FreqTable[2048] = { -#include "SAAFreq.dat" -}; -#else -unsigned long CSAAFreq::m_FreqTable[2048]; -unsigned long CSAAFreq::m_nClockRate = 0; -#endif // SAAFREQ_FIXED_CLOCKRATE - const int INITIAL_LEVEL = 1; ////////////////////////////////////////////////////////////////////// diff --git a/extern/SAASound/src/SAAFreq.h b/extern/SAASound/src/SAAFreq.h index 47875462..716c085e 100755 --- a/extern/SAASound/src/SAAFreq.h +++ b/extern/SAASound/src/SAAFreq.h @@ -20,8 +20,8 @@ private: const static unsigned long m_FreqTable[2048]; #else // we'll calculate the frequency lookup table at runtime. - static unsigned long m_FreqTable[2048]; - static unsigned long m_nClockRate; + unsigned long m_FreqTable[2048]; + unsigned long m_nClockRate; #endif unsigned long m_nCounter;