diff options
author | Paweł Kołodziejski | 2003-09-02 07:49:40 +0000 |
---|---|---|
committer | Paweł Kołodziejski | 2003-09-02 07:49:40 +0000 |
commit | 5a6bce590b4261d2ff5615cbdccf2da66e5586e2 (patch) | |
tree | b1a8734944281b12cc21d1a4eb4c5590bf7c517c /scumm | |
parent | f59a0633d6c58b1e37aaaa27af5ad6e4115e436a (diff) | |
download | scummvm-rg350-5a6bce590b4261d2ff5615cbdccf2da66e5586e2.tar.gz scummvm-rg350-5a6bce590b4261d2ff5615cbdccf2da66e5586e2.tar.bz2 scummvm-rg350-5a6bce590b4261d2ff5615cbdccf2da66e5586e2.zip |
changed sounds volume to original volume level, and fixed sounds in bass intro
svn-id: r9963
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/imuse_digi.cpp | 2 | ||||
-rw-r--r-- | scumm/smush/smush_mixer.cpp | 2 | ||||
-rw-r--r-- | scumm/smush/smush_player.cpp | 2 | ||||
-rw-r--r-- | scumm/sound.cpp | 24 |
4 files changed, 15 insertions, 15 deletions
diff --git a/scumm/imuse_digi.cpp b/scumm/imuse_digi.cpp index 472bc44134..497eafb71f 100644 --- a/scumm/imuse_digi.cpp +++ b/scumm/imuse_digi.cpp @@ -806,7 +806,7 @@ void IMuseDigital::handler() { if (_scumm->_silentDigitalImuse == false) { if (_channel[l]._mixerChannel == 0) { _scumm->_mixer->newStream(&_channel[l]._mixerChannel, buf, mixer_size, - _channel[l]._freq, _channel[l]._mixerFlags, 100000, 127, 0); + _channel[l]._freq, _channel[l]._mixerFlags, 100000, 255, 0); } else { _scumm->_mixer->appendStream(_channel[l]._mixerChannel, buf, mixer_size); } diff --git a/scumm/smush/smush_mixer.cpp b/scumm/smush/smush_mixer.cpp index 04247fe2b4..02dc117b29 100644 --- a/scumm/smush/smush_mixer.cpp +++ b/scumm/smush/smush_mixer.cpp @@ -135,7 +135,7 @@ bool SmushMixer::handleFrame() { if (_silentMixer == false) { if (_channels[i].mixer_index == 0) { - _mixer->newStream(&_channels[i].mixer_index, data, size, rate, flags, 500000, 127, 0); + _mixer->newStream(&_channels[i].mixer_index, data, size, rate, flags, 500000, 255, 0); } else { _mixer->appendStream(_channels[i].mixer_index, data, size); } diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp index 4775167777..e82c7d6ae8 100644 --- a/scumm/smush/smush_player.cpp +++ b/scumm/smush/smush_player.cpp @@ -460,7 +460,7 @@ void SmushPlayer::handleImuseAction(Chunk &b) { if (_IACTchannel == 0) { _scumm->_mixer->newStream(&_IACTchannel, output_data, 0x1000, 22050, - SoundMixer::FLAG_STEREO | SoundMixer::FLAG_16BITS, 200000, 127, 0); + SoundMixer::FLAG_STEREO | SoundMixer::FLAG_16BITS, 200000, 255, 0); } else { _scumm->_mixer->appendStream(_IACTchannel, output_data, 0x1000); } diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 0e6db267ea..29191fb82b 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -214,7 +214,7 @@ void Sound::playSound(int soundID) { // Allocate a sound buffer, copy the data into it, and play sound = (char *)malloc(size); memcpy(sound, ptr, size); - _scumm->_mixer->playRaw(NULL, sound, size, rate, flags, 127, 0, soundID); + _scumm->_mixer->playRaw(NULL, sound, size, rate, flags, 255, 0, soundID); return; } // Support for Putt-Putt sounds - very hackish, too 8-) @@ -232,7 +232,7 @@ void Sound::playSound(int soundID) { // Allocate a sound buffer, copy the data into it, and play sound = (char *)malloc(size); memcpy(sound, ptr + 8, size); - _scumm->_mixer->playRaw(NULL, sound, size, rate, flags, 127, 0, soundID); + _scumm->_mixer->playRaw(NULL, sound, size, rate, flags, 255, 0, soundID); return; } else if (READ_UINT32(ptr) == MKID('MRAW')) { @@ -249,7 +249,7 @@ void Sound::playSound(int soundID) { // Allocate a sound buffer, copy the data into it, and play sound = (char *)malloc(size); memcpy(sound, ptr + 8, size); - _scumm->_mixer->playRaw(NULL, sound, size, rate, flags, 127, 0, soundID); + _scumm->_mixer->playRaw(NULL, sound, size, rate, flags, 255, 0, soundID); return; } @@ -318,7 +318,7 @@ void Sound::playSound(int soundID) { // Allocate a sound buffer, copy the data into it, and play sound = (char *)malloc(size); memcpy(sound, ptr + 33, size); - _scumm->_mixer->playRaw(NULL, sound, size, rate, flags, 127, 0, soundID); + _scumm->_mixer->playRaw(NULL, sound, size, rate, flags, 255, 0, soundID); return; } else if (_scumm->_features & GF_FMTOWNS) { size = READ_LE_UINT32(ptr); @@ -361,7 +361,7 @@ void Sound::playSound(int soundID) { } } - _scumm->_mixer->playRaw(NULL, sound, waveSize, rate, flags, 127, 0, soundID, loopStart, loopEnd); + _scumm->_mixer->playRaw(NULL, sound, waveSize, rate, flags, 255, 0, soundID, loopStart, loopEnd); } break; } @@ -446,10 +446,10 @@ void Sound::playSound(int soundID) { // the first check is for pitch-bending looped sounds (i.e. "pouring liquid", "biplane dive", etc.) // the second check is for simple looped sounds _scumm->_mixer->playRaw(NULL, sound, size, rate, - SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_LOOP, 127, 0, soundID, + SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_LOOP, 255, 0, soundID, READ_BE_UINT16(ptr + 10) - READ_BE_UINT16(ptr + 8),READ_BE_UINT16(ptr + 14)); } else { - _scumm->_mixer->playRaw(NULL, sound, size, rate, SoundMixer::FLAG_AUTOFREE, 127, 0, soundID); + _scumm->_mixer->playRaw(NULL, sound, size, rate, SoundMixer::FLAG_AUTOFREE, 255, 0, soundID); } return; } @@ -468,10 +468,10 @@ void Sound::playSound(int soundID) { // Experimental sound looping support if (start == 108 || start == 106) _scumm->_mixer->playRaw(NULL, sound, size, rate, - SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_LOOP, 127, 0, soundID, + SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_LOOP, 255, 0, soundID, start,size); else - _scumm->_mixer->playRaw(NULL, sound, size, rate, SoundMixer::FLAG_AUTOFREE, 127, 0, soundID); + _scumm->_mixer->playRaw(NULL, sound, size, rate, SoundMixer::FLAG_AUTOFREE, 255, 0, soundID); return; } } @@ -570,7 +570,7 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, PlayingSoundHandle _sfxFile->seek(offset + 48, SEEK_SET); sound = (byte *)malloc(b - 64); _sfxFile->read(sound, b - 64); - _scumm->_mixer->playRaw(handle, sound, b - 64, 11025, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE, 127, 0); + _scumm->_mixer->playRaw(handle, sound, b - 64, 11025, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE, 255, 0); return; } @@ -1256,7 +1256,7 @@ void Sound::bundleMusicHandler(Scumm *scumm) { _bundleMusicPosition += final_size; if (_bundleMusicTrack == 0) { _scumm->_mixer->newStream(&_bundleMusicTrack, buffer, final_size, rate, - SoundMixer::FLAG_16BITS | SoundMixer::FLAG_STEREO, 300000, 127, 0); + SoundMixer::FLAG_16BITS | SoundMixer::FLAG_STEREO, 300000, 255, 0); } else { _scumm->_mixer->appendStream(_bundleMusicTrack, buffer, final_size); } @@ -1381,7 +1381,7 @@ void Sound::playSfxSound(void *sound, uint32 size, uint rate, bool isUnsigned, P byte flags = SoundMixer::FLAG_AUTOFREE; if (isUnsigned) flags |= SoundMixer::FLAG_UNSIGNED; - _scumm->_mixer->playRaw(handle, sound, size, rate, flags, 127, 0); + _scumm->_mixer->playRaw(handle, sound, size, rate, flags, 255, 0); } #ifdef USE_VORBIS |