diff options
| author | Max Horn | 2004-12-27 00:27:00 +0000 |
|---|---|---|
| committer | Max Horn | 2004-12-27 00:27:00 +0000 |
| commit | 67b311713d8f4cfcd460a9649e0075f24278a048 (patch) | |
| tree | b3cc2c445a34084ab1baa645c1ae818c44268eff /queen | |
| parent | 6670b2969a3669ae7bda7103407e8e5e22c2916a (diff) | |
| download | scummvm-rg350-67b311713d8f4cfcd460a9649e0075f24278a048.tar.gz scummvm-rg350-67b311713d8f4cfcd460a9649e0075f24278a048.tar.bz2 scummvm-rg350-67b311713d8f4cfcd460a9649e0075f24278a048.zip | |
Added 'sound types' to the mixer - for now, only plain (for the premixer), SFX and music; volume is now controlled based on the sound type
svn-id: r16330
Diffstat (limited to 'queen')
| -rw-r--r-- | queen/queen.cpp | 4 | ||||
| -rw-r--r-- | queen/sound.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/queen/queen.cpp b/queen/queen.cpp index 22fad036f7..ddb7523206 100644 --- a/queen/queen.cpp +++ b/queen/queen.cpp @@ -358,9 +358,9 @@ int QueenEngine::init(GameDetector &detector) { if (!_mixer->isReady()) warning("Sound initialisation failed."); - _mixer->setVolume(ConfMan.getInt("sfx_volume")); + _mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, ConfMan.getInt("sfx_volume")); // Set mixer music volume to maximum, since music volume is regulated by MusicPlayer's MIDI messages - _mixer->setMusicVolume(256); + _mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, 256); int midiDriver = MidiDriver::detectMusicDriver(MDT_NATIVE | MDT_ADLIB | MDT_PREFER_NATIVE); MidiDriver *driver = MidiDriver::createMidi(midiDriver); diff --git a/queen/sound.cpp b/queen/sound.cpp index d551564bbd..d98b64595b 100644 --- a/queen/sound.cpp +++ b/queen/sound.cpp @@ -201,7 +201,7 @@ void SBSound::sfxPlay(const char *name, bool isSpeech) { void MP3Sound::sfxPlay(const char *name, bool isSpeech) { uint32 size; File *f = _vm->resource()->giveCompressedSound(name, &size); - _mixer->playInputStream(isSpeech ? &_speechHandle : &_sfxHandle, makeMP3Stream(f, size), false); + _mixer->playInputStream(SoundMixer::kSFXAudioDataType, isSpeech ? &_speechHandle : &_sfxHandle, makeMP3Stream(f, size)); } #endif @@ -209,7 +209,7 @@ void MP3Sound::sfxPlay(const char *name, bool isSpeech) { void OGGSound::sfxPlay(const char *name, bool isSpeech) { uint32 size; File *f = _vm->resource()->giveCompressedSound(name, &size); - _mixer->playInputStream(isSpeech ? &_speechHandle : &_sfxHandle, makeVorbisStream(f, size), false); + _mixer->playInputStream(SoundMixer::kSFXAudioDataType, isSpeech ? &_speechHandle : &_sfxHandle, makeVorbisStream(f, size)); } #endif @@ -217,7 +217,7 @@ void OGGSound::sfxPlay(const char *name, bool isSpeech) { void FLACSound::sfxPlay(const char *name, bool isSpeech) { uint32 size; File *f = _vm->resource()->giveCompressedSound(name, &size); - _mixer->playInputStream(isSpeech ? &_speechHandle : &_sfxHandle, makeFlacStream(f, size), false); + _mixer->playInputStream(SoundMixer::kSFXAudioDataType, isSpeech ? &_speechHandle : &_sfxHandle, makeFlacStream(f, size)); } #endif |