[Scummvm-git-logs] scummvm master -> 6f26c8099a012f4a8ab28b267d6229912a24f683

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6f26c8099a BAGEL: Simplify some code by using CLIP, remove useless asserts, functions and variables


Commit: 6f26c8099a012f4a8ab28b267d6229912a24f683
    https://github.com/scummvm/scummvm/commit/6f26c8099a012f4a8ab28b267d6229912a24f683
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-05-14T06:13:23+01:00

Commit Message:
BAGEL: Simplify some code by using CLIP, remove useless asserts, functions and variables

Changed paths:
    engines/bagel/boflib/sound.cpp
    engines/bagel/boflib/sound.h


diff --git a/engines/bagel/boflib/sound.cpp b/engines/bagel/boflib/sound.cpp
index 48b1027cfbb..8bc4c5e08c2 100644
--- a/engines/bagel/boflib/sound.cpp
+++ b/engines/bagel/boflib/sound.cpp
@@ -161,9 +161,6 @@ CBofSound::~CBofSound() {
 
 
 void CBofSound::initialize() {
-	_bSoundAvailable = true;
-	_bMidiAvailable = false;
-
 	for (int i = 0; i < NUM_QUEUES; ++i)
 		_cQueue[i] = new CQueue();
 
@@ -187,20 +184,10 @@ void CBofSound::shutdown() {
 }
 
 
-
 void CBofSound::setVolume(int nVolume) {
 	assert(nVolume >= VOLUME_INDEX_MIN && nVolume <= VOLUME_INDEX_MAX);
-	int nLocalVolume = nVolume;
-
-	if (nLocalVolume < VOLUME_INDEX_MIN) {
-		nLocalVolume = VOLUME_INDEX_MIN;
-
-	} else if (nLocalVolume > VOLUME_INDEX_MAX) {
-		nLocalVolume = VOLUME_INDEX_MAX;
-	}
-
-	_nVol = nLocalVolume;
 
+	_nVol = CLIP(nVolume, VOLUME_INDEX_MIN, VOLUME_INDEX_MAX);
 	g_system->getMixer()->setChannelVolume(_handle, VOLUME_SVM(_nVol));
 
 	// TODO: MIDI volume
@@ -211,29 +198,14 @@ void CBofSound::setVolume(int nMidiVolume, int nWaveVolume) {
 	assert(nMidiVolume >= VOLUME_INDEX_MIN && nMidiVolume <= VOLUME_INDEX_MAX);
 	assert(nWaveVolume >= VOLUME_INDEX_MIN && nWaveVolume <= VOLUME_INDEX_MAX);
 
-    assert(nMidiVolume >= VOLUME_INDEX_MIN && nMidiVolume <= VOLUME_INDEX_MAX);
-	assert(nWaveVolume >= VOLUME_INDEX_MIN && nWaveVolume <= VOLUME_INDEX_MAX);
-
-	if (nWaveVolume < VOLUME_INDEX_MIN) {
-		nWaveVolume = VOLUME_INDEX_MIN;
-
-	} else if (nWaveVolume > VOLUME_INDEX_MAX) {
-		nWaveVolume = VOLUME_INDEX_MAX;
-	}
-
 	// Set master wave volume
-	g_system->getMixer()->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, VOLUME_SVM(nWaveVolume));
-
-	if (nMidiVolume < VOLUME_INDEX_MIN) {
-		nMidiVolume = VOLUME_INDEX_MIN;
-
-	} else if (nMidiVolume > VOLUME_INDEX_MAX) {
-		nMidiVolume = VOLUME_INDEX_MAX;
-	}
+	int clippedVol = CLIP(nWaveVolume, VOLUME_INDEX_MIN, VOLUME_INDEX_MAX);
+	g_system->getMixer()->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, VOLUME_SVM(clippedVol));
 
 	// Set master Midi volume
-	g_system->getMixer()->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, VOLUME_SVM(nMidiVolume));
-	g_engine->_midi->setVolume(VOLUME_SVM(nMidiVolume));
+	clippedVol = CLIP(nMidiVolume, VOLUME_INDEX_MIN, VOLUME_INDEX_MAX);
+	g_system->getMixer()->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, VOLUME_SVM(clippedVol));
+	g_engine->_midi->setVolume(VOLUME_SVM(clippedVol));
 }
 
 
@@ -542,16 +514,6 @@ void CBofSound::clearMidiSounds() {
 }
 
 
-bool CBofSound::soundAvailable() {
-	return _bSoundAvailable;                     // Return requested info
-}
-
-
-bool CBofSound::midiAvailable() {
-	return _bMidiAvailable;                      // Return requested info
-}
-
-
 void CBofSound::waitSounds() {
 	waitWaveSounds();
 	waitMidiSounds();
diff --git a/engines/bagel/boflib/sound.h b/engines/bagel/boflib/sound.h
index 63157a9e581..55b4f82bd55 100644
--- a/engines/bagel/boflib/sound.h
+++ b/engines/bagel/boflib/sound.h
@@ -131,14 +131,6 @@ public:
 	static void initialize();
 	static void shutdown();
 	static void setVolume(int MidiVolume, int WaveVolume);
-	static bool soundAvailable();
-	static bool midiAvailable();
-	static bool soundVolumeAvailable() {
-		return _bWaveVolume;
-	}
-	static bool midiVolumeAvailable() {
-		return _bMidiVolume;
-	}
 
 	static bool soundPlaying() {
 		return (_nCount > 0) ? true : false;