From de04870db26175dfd065a5708d85a337ca07aad4 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Wed, 2 Apr 2025 08:58:16 +0200
Subject: [PATCH] CMS/SAA: Fix warnings.

---
 src/sound/saasound/SAADevice.cpp |  2 +-
 src/sound/saasound/SAAEnv.cpp    |  8 ++++----
 src/sound/saasound/SAAFreq.cpp   | 17 ++++++++++++-----
 src/sound/saasound/SAAImpl.cpp   | 14 ++++++++------
 src/sound/saasound/SAANoise.cpp  |  4 ++--
 src/sound/snd_cms.c              |  2 --
 6 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/sound/saasound/SAADevice.cpp b/src/sound/saasound/SAADevice.cpp
index 306aa477a..718b05a95 100644
--- a/src/sound/saasound/SAADevice.cpp
+++ b/src/sound/saasound/SAADevice.cpp
@@ -107,7 +107,7 @@ void CSAADevice::_SetSampleRate(unsigned int nSampleRate)
 
 void CSAADevice::_SetOversample(unsigned int nOversample)
 {
-	if (nOversample != m_nOversample)
+	if (((int) nOversample) != m_nOversample)
 	{
 		m_nOversample = nOversample;
 		m_Osc0._SetOversample(nOversample);
diff --git a/src/sound/saasound/SAAEnv.cpp b/src/sound/saasound/SAAEnv.cpp
index ae8191112..049f51f96 100755
--- a/src/sound/saasound/SAAEnv.cpp
+++ b/src/sound/saasound/SAAEnv.cpp
@@ -40,12 +40,12 @@ const ENVDATA CSAAEnv::cs_EnvData[8] =
 CSAAEnv::CSAAEnv()
 :
 m_bEnabled(false),
-m_bNewData(false),
-m_nNextData(0),
-m_bEnvelopeEnded(true),
 m_nPhase(0),
 m_nPhasePosition(0),
-m_nResolution(1)
+m_bEnvelopeEnded(true),
+m_nResolution(1),
+m_bNewData(false),
+m_nNextData(0)
 {
 	// initialise itself with the value 'zero'
 	SetEnvControl(0);
diff --git a/src/sound/saasound/SAAFreq.cpp b/src/sound/saasound/SAAFreq.cpp
index 52cbc7a3d..61a04f6ad 100755
--- a/src/sound/saasound/SAAFreq.cpp
+++ b/src/sound/saasound/SAAFreq.cpp
@@ -32,11 +32,18 @@ const int INITIAL_LEVEL = 1;
 
 CSAAFreq::CSAAFreq(CSAANoise * const NoiseGenerator, CSAAEnv * const EnvGenerator)
 :
-m_nCounter(0), m_nCounter_low(0), m_nAdd(0),
+m_nCounter(0),
+m_nAdd(0),
+m_nCounter_low(0),
+m_nOversample(0),
+m_nCounterLimit_low(1),
 m_nLevel(INITIAL_LEVEL),
-m_nOversample(0), m_nCounterLimit_low(1),
-m_nCurrentOffset(0), m_nCurrentOctave(0), m_nNextOffset(0), m_nNextOctave(0),
-m_bIgnoreOffsetData(false), m_bNewData(false), 
+m_nCurrentOffset(0),
+m_nCurrentOctave(0),
+m_nNextOffset(0),
+m_nNextOctave(0),
+m_bIgnoreOffsetData(false),
+m_bNewData(false), 
 m_bSync(false),
 m_nSampleRate(SAMPLE_RATE_HZ),
 m_pcConnectedNoiseGenerator(NoiseGenerator),
@@ -194,7 +201,7 @@ void CSAAFreq::_SetClockRate(int nClockRate)
 	// Finally, note that the standard formula corresponds to a 8MHz base clock
 	// so we rescale the final result by the ratio nClockRate/8000000
 
-	if (nClockRate != m_nClockRate)
+	if (((unsigned long) nClockRate) != m_nClockRate)
 	{
 		m_nClockRate = nClockRate;
 		int ix = 0;
diff --git a/src/sound/saasound/SAAImpl.cpp b/src/sound/saasound/SAAImpl.cpp
index 8545d3849..f136eefc6 100644
--- a/src/sound/saasound/SAAImpl.cpp
+++ b/src/sound/saasound/SAAImpl.cpp
@@ -20,16 +20,18 @@
 
 CSAASoundInternal::CSAASoundInternal()
 	:
-m_nClockRate(EXTERNAL_CLK_HZ),
-m_bHighpass(false),
-m_nSampleRate(SAMPLE_RATE_HZ),
-m_nOversample(DEFAULT_OVERSAMPLE),
+m_chip(),
 m_uParam(0),
 m_uParamRate(0),
+m_nClockRate(EXTERNAL_CLK_HZ),
+m_nSampleRate(SAMPLE_RATE_HZ),
+m_nOversample(DEFAULT_OVERSAMPLE),
 #if defined(DEBUGSAA) || defined(USE_CONFIG_FILE)
-m_nDebugSample(0),
+m_bHighpass(false),
+m_nDebugSample(0)
+#else
+m_bHighpass(false)
 #endif
-m_chip()
 {
 #ifdef USE_CONFIG_FILE
 	m_Config.ReadConfig();
diff --git a/src/sound/saasound/SAANoise.cpp b/src/sound/saasound/SAANoise.cpp
index 895a5a103..1cf3458dd 100755
--- a/src/sound/saasound/SAANoise.cpp
+++ b/src/sound/saasound/SAANoise.cpp
@@ -25,8 +25,8 @@ CSAANoise::CSAANoise()
 :
 m_nCounter(0),
 m_nCounter_low(0),
-m_nCounterLimit_low(1),
 m_nOversample(0),
+m_nCounterLimit_low(1),
 m_bSync(false),
 m_nSampleRate(SAMPLE_RATE_HZ),
 m_nSourceMode(0),
@@ -40,8 +40,8 @@ CSAANoise::CSAANoise(unsigned long seed)
 :
 m_nCounter(0),
 m_nCounter_low(0),
-m_nCounterLimit_low(1),
 m_nOversample(0),
+m_nCounterLimit_low(1),
 m_bSync(false),
 m_nSampleRate(SAMPLE_RATE_HZ),
 m_nSourceMode(0),
diff --git a/src/sound/snd_cms.c b/src/sound/snd_cms.c
index 60165365d..c6591b1fc 100644
--- a/src/sound/snd_cms.c
+++ b/src/sound/snd_cms.c
@@ -56,8 +56,6 @@ void
 cms_write(uint16_t addr, uint8_t val, void *priv)
 {
     cms_t *cms = (cms_t *) priv;
-    int    voice;
-    int    chip = (addr & 2) >> 1;
 
     switch (addr & 0xf) {
         case 0x1: /* SAA #1 Register Select Port */