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

[dreammaster]

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:
e94b88f586 AGS: Properly maintain volume changes across savegames


Commit: e94b88f5869562375bdeba841e67e214133b0b16
    https://github.com/scummvm/scummvm/commit/e94b88f5869562375bdeba841e67e214133b0b16
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-08-27T19:35:01-07:00

Commit Message:
AGS: Properly maintain volume changes across savegames

Changed paths:
    engines/ags/engine/media/audio/clip_my_midi.cpp
    engines/ags/engine/media/audio/sound_clip.cpp


diff --git a/engines/ags/engine/media/audio/clip_my_midi.cpp b/engines/ags/engine/media/audio/clip_my_midi.cpp
index aca3a4a442..d0f48119bc 100644
--- a/engines/ags/engine/media/audio/clip_my_midi.cpp
+++ b/engines/ags/engine/media/audio/clip_my_midi.cpp
@@ -100,6 +100,7 @@ bool MYMIDI::is_playing() const {
 }
 
 void MYMIDI::set_volume(int volume) {
+	_vol = volume;
 	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, volume);
 }
 
diff --git a/engines/ags/engine/media/audio/sound_clip.cpp b/engines/ags/engine/media/audio/sound_clip.cpp
index 703db004cd..ee6a0bad0f 100644
--- a/engines/ags/engine/media/audio/sound_clip.cpp
+++ b/engines/ags/engine/media/audio/sound_clip.cpp
@@ -62,7 +62,7 @@ void SoundClipWaveBase::poll() {
 
 int SoundClipWaveBase::play() {
 	_mixer->playStream(_soundType, &_soundHandle, _stream,
-	                   -1, 255, 0, DisposeAfterUse::NO);
+	                   -1, _vol, 0, DisposeAfterUse::NO);
 	return 1;
 }
 
@@ -127,6 +127,7 @@ int SoundClipWaveBase::get_length_ms() {
 }
 
 void SoundClipWaveBase::set_volume(int volume) {
+	_vol = volume;
 	_mixer->setChannelVolume(_soundHandle, volume);
 }