[Scummvm-cvs-logs] SF.net SVN: scummvm:[33093] scummvm/branches/gsoc2008-rtl/engines/queen
cpage88 at users.sourceforge.net
cpage88 at users.sourceforge.net
Fri Jul 18 03:46:33 CEST 2008
Revision: 33093
http://scummvm.svn.sourceforge.net/scummvm/?rev=33093&view=rev
Author: cpage88
Date: 2008-07-18 01:46:33 +0000 (Fri, 18 Jul 2008)
Log Message:
-----------
QUEEN sound settings work with the GMM
Modified Paths:
--------------
scummvm/branches/gsoc2008-rtl/engines/queen/midiadlib.cpp
scummvm/branches/gsoc2008-rtl/engines/queen/queen.cpp
scummvm/branches/gsoc2008-rtl/engines/queen/sound.cpp
Modified: scummvm/branches/gsoc2008-rtl/engines/queen/midiadlib.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/queen/midiadlib.cpp 2008-07-17 21:58:43 UTC (rev 33092)
+++ scummvm/branches/gsoc2008-rtl/engines/queen/midiadlib.cpp 2008-07-18 01:46:33 UTC (rev 33093)
@@ -132,7 +132,7 @@
adlibSetNoteVolume(i, 0);
adlibTurnNoteOff(i);
}
- _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, false, true);
+ _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, false, true);
return 0;
}
Modified: scummvm/branches/gsoc2008-rtl/engines/queen/queen.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/queen/queen.cpp 2008-07-17 21:58:43 UTC (rev 33092)
+++ scummvm/branches/gsoc2008-rtl/engines/queen/queen.cpp 2008-07-18 01:46:33 UTC (rev 33093)
@@ -181,7 +181,7 @@
}
void QueenEngine::syncSoundSettings() {
- _sound->setVolume(ConfMan.getInt("music_volume"));
+ readOptionSettings();
}
void QueenEngine::readOptionSettings() {
@@ -432,10 +432,6 @@
_logic = new LogicGame(this);
}
- _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
- // Set mixer music volume to maximum, since music volume is regulated by MusicPlayer's MIDI messages
- _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, Audio::Mixer::kMaxMixerVolume);
-
_sound = Sound::makeSoundInstance(_mixer, this, _resource->getCompression());
_walk = new Walk(this);
//_talkspeedScale = (MAX_TEXT_SPEED - MIN_TEXT_SPEED) / 255.0;
Modified: scummvm/branches/gsoc2008-rtl/engines/queen/sound.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/queen/sound.cpp 2008-07-17 21:58:43 UTC (rev 33092)
+++ scummvm/branches/gsoc2008-rtl/engines/queen/sound.cpp 2008-07-18 01:46:33 UTC (rev 33093)
@@ -224,7 +224,6 @@
void PCSound::setVolume(int vol) {
Sound::setVolume(vol);
- _mixer->setVolumeForSoundType(Audio::Mixer::kPlainSoundType, vol);
_music->setVolume(vol);
}
@@ -275,7 +274,10 @@
if (sound) {
f->read(sound, size);
byte flags = Audio::Mixer::FLAG_UNSIGNED | Audio::Mixer::FLAG_AUTOFREE;
- _mixer->playRaw(Audio::Mixer::kSFXSoundType, soundHandle, sound, size, 11025, flags);
+ if (soundHandle == &_speechHandle)
+ _mixer->playRaw(Audio::Mixer::kSpeechSoundType, soundHandle, sound, size, 11025, flags);
+ else
+ _mixer->playRaw(Audio::Mixer::kSFXSoundType, soundHandle, sound, size, 11025, flags);
}
}
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