[Scummvm-cvs-logs] SF.net SVN: scummvm:[33831] scummvm/branches/branch-0-12-0/backends/ platform/wince/wince-sdl.cpp

knakos at users.sourceforge.net knakos at users.sourceforge.net
Wed Aug 13 17:17:53 CEST 2008


Revision: 33831
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33831&view=rev
Author:   knakos
Date:     2008-08-13 15:17:51 +0000 (Wed, 13 Aug 2008)

Log Message:
-----------
fix bug #2038992 by saving and restoring channel volumes (sync)

Modified Paths:
--------------
    scummvm/branches/branch-0-12-0/backends/platform/wince/wince-sdl.cpp

Modified: scummvm/branches/branch-0-12-0/backends/platform/wince/wince-sdl.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/backends/platform/wince/wince-sdl.cpp	2008-08-13 15:17:49 UTC (rev 33830)
+++ scummvm/branches/branch-0-12-0/backends/platform/wince/wince-sdl.cpp	2008-08-13 15:17:51 UTC (rev 33831)
@@ -805,8 +805,16 @@
 		debug(1, "Sound opened OK, mixing at %d Hz", _sampleRate);
 
 		// Re-create mixer to match the output rate
+		int vol1 = _mixer->getVolumeForSoundType(Audio::Mixer::kPlainSoundType);
+		int vol2 = _mixer->getVolumeForSoundType(Audio::Mixer::kMusicSoundType);
+		int vol3 = _mixer->getVolumeForSoundType(Audio::Mixer::kSFXSoundType);
+		int vol4 = _mixer->getVolumeForSoundType(Audio::Mixer::kSpeechSoundType);
 		delete(_mixer);
 		_mixer = new Audio::MixerImpl(this);
+		_mixer->setVolumeForSoundType(Audio::Mixer::kPlainSoundType, vol1);
+		_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, vol2);
+		_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, vol3);
+		_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, vol4);
 		_mixer->setOutputRate(_sampleRate);
 		_mixer->setReady(true);
 		SDL_PauseAudio(0);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list