[Scummvm-git-logs] scummvm master -> e17b05371ea9c3649adf68d9a948ab81d8050781

[aquadran]

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

Summary:
e17b05371e WINTERMUTE: Small sync with original


Commit: e17b05371ea9c3649adf68d9a948ab81d8050781
    https://github.com/scummvm/scummvm/commit/e17b05371ea9c3649adf68d9a948ab81d8050781
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-09-23T16:04:41+02:00

Commit Message:
WINTERMUTE: Small sync with original

Changed paths:
    engines/wintermute/base/sound/base_sound.cpp
    engines/wintermute/base/sound/base_sound_buffer.cpp
    engines/wintermute/base/sound/base_sound_buffer.h
    engines/wintermute/base/sound/base_sound_manager.cpp


diff --git a/engines/wintermute/base/sound/base_sound.cpp b/engines/wintermute/base/sound/base_sound.cpp
index abbead97c9a..41891e04a36 100644
--- a/engines/wintermute/base/sound/base_sound.cpp
+++ b/engines/wintermute/base/sound/base_sound.cpp
@@ -94,9 +94,9 @@ bool BaseSound::setSoundSimple() {
 		if (_soundPosition) {
 			_sound->setPosition(_soundPosition);
 		}
-		_sound->setLooping(_soundLooping);
+		_sound->_looping = _soundLooping;
 		_sound->setPrivateVolume(_soundPrivateVolume);
-		_sound->setLoopStart(_soundLoopStart);
+		_sound->_loopStart = _soundLoopStart;
 		_sound->_freezePaused = _soundFreezePaused;
 		if (_soundPlaying) {
 			return _sound->resume();
@@ -164,13 +164,13 @@ bool BaseSound::resume() {
 bool BaseSound::persist(BasePersistenceManager *persistMgr) {
 	if (persistMgr->getIsSaving() && _sound) {
 		_soundPlaying = _sound->isPlaying();
-		_soundLooping = _sound->isLooping();
-		_soundPrivateVolume = _sound->getPrivateVolume();
+		_soundLooping = _sound->_looping;
+		_soundPrivateVolume = _sound->_privateVolume;
 		if (_soundPlaying) {
 			_soundPosition = _sound->getPosition();
 		}
-		_soundLoopStart = _sound->getLoopStart();
-		_soundFreezePaused = _sound->isFreezePaused();
+		_soundLoopStart = _sound->_loopStart;
+		_soundFreezePaused = _sound->_freezePaused;
 	}
 
 	if (persistMgr->getIsSaving()) {
@@ -244,7 +244,7 @@ bool BaseSound::setPrivateVolume(int volume) {
 	if (!_sound) {
 		return STATUS_FAILED;
 	} else {
-		_sound->setPrivateVolume(volume);
+		return _sound->_privateVolume = volume;
 		return STATUS_OK;
 	}
 }
@@ -254,7 +254,7 @@ int BaseSound::getVolume() {
 	if (!_sound) {
 		return 0;
 	} else {
-		return _sound->getPrivateVolume();
+		return _sound->_privateVolume;
 	}
 }
 
diff --git a/engines/wintermute/base/sound/base_sound_buffer.cpp b/engines/wintermute/base/sound/base_sound_buffer.cpp
index 48d9f231cd2..ba1e46436a4 100644
--- a/engines/wintermute/base/sound/base_sound_buffer.cpp
+++ b/engines/wintermute/base/sound/base_sound_buffer.cpp
@@ -321,22 +321,6 @@ bool BaseSoundBuffer::applyFX(TSFXType type, float param1, float param2, float p
 	return STATUS_OK;
 }
 
-bool BaseSoundBuffer::isLooping() const {
-	return _looping;
-}
-
-bool BaseSoundBuffer::isFreezePaused() const {
-	return _freezePaused;
-}
-
-void BaseSoundBuffer::setFreezePaused(bool freezePaused) {
-	_freezePaused = freezePaused;
-}
-
-TSoundType BaseSoundBuffer::getType() const {
-	return _type;
-}
-
 int32 BaseSoundBuffer::getPrivateVolume() const {
 	return _privateVolume;
 }
diff --git a/engines/wintermute/base/sound/base_sound_buffer.h b/engines/wintermute/base/sound/base_sound_buffer.h
index 8a8ac586100..c0d9a75c0ca 100644
--- a/engines/wintermute/base/sound/base_sound_buffer.h
+++ b/engines/wintermute/base/sound/base_sound_buffer.h
@@ -69,15 +69,11 @@ public:
 	void updateVolume();
 
 	void setType(TSoundType type);
-	TSoundType getType() const;
 
 	bool loadFromFile(const char *filename, bool forceReload = false);
 	void setStreaming(bool streamed, uint32 numBlocks = 0, uint32 blockSize = 0);
 	bool applyFX(TSFXType type, float param1, float param2, float param3, float param4);
 	int32 getPrivateVolume() const;
-	void setFreezePaused(bool freezePaused);
-	bool isFreezePaused() const;
-	bool isLooping() const;
 
 	bool _freezePaused;
 	uint32 _loopStart;
diff --git a/engines/wintermute/base/sound/base_sound_manager.cpp b/engines/wintermute/base/sound/base_sound_manager.cpp
index 7d3265363bd..c396e8128a4 100644
--- a/engines/wintermute/base/sound/base_sound_manager.cpp
+++ b/engines/wintermute/base/sound/base_sound_manager.cpp
@@ -247,14 +247,12 @@ byte BaseSoundMgr::getMasterVolumePercent() {
 }
 
 
-
 //////////////////////////////////////////////////////////////////////////
 bool BaseSoundMgr::pauseAll(bool includingMusic) {
-
 	for (int32 i = 0; i < _sounds.getSize(); i++) {
-		if (_sounds[i]->isPlaying() && (_sounds[i]->getType() != TSoundType::SOUND_MUSIC || includingMusic)) {
+		if (_sounds[i]->isPlaying() && (_sounds[i]->_type != TSoundType::SOUND_MUSIC || includingMusic)) {
 			_sounds[i]->pause();
-			_sounds[i]->setFreezePaused(true);
+			_sounds[i]->_freezePaused = true;
 		}
 	}
 
@@ -266,9 +264,9 @@ bool BaseSoundMgr::pauseAll(bool includingMusic) {
 bool BaseSoundMgr::resumeAll() {
 
 	for (int32 i = 0; i < _sounds.getSize(); i++) {
-		if (_sounds[i]->isFreezePaused()) {
+		if (_sounds[i]->_freezePaused) {
 			_sounds[i]->resume();
-			_sounds[i]->setFreezePaused(false);
+			_sounds[i]->_freezePaused = false;
 		}
 	}