aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--scumm/imuse_digi.cpp2
-rw-r--r--scumm/smush/smush_mixer.cpp2
-rw-r--r--scumm/smush/smush_player.cpp2
-rw-r--r--scumm/sound.cpp24
-rw-r--r--simon/sound.cpp6
-rw-r--r--sky/intro.cpp6
-rw-r--r--sky/sound.cpp8
7 files changed, 25 insertions, 25 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
diff --git a/simon/sound.cpp b/simon/sound.cpp
index 81df8c1258..98a0cbd05e 100644
--- a/simon/sound.cpp
+++ b/simon/sound.cpp
@@ -174,7 +174,7 @@ int WavSound::playSound(uint sound, PlayingSoundHandle *handle, byte flags) {
byte *buffer = (byte *)malloc(data[1]);
_file->read(buffer, data[1]);
- return _mixer->playRaw(handle, buffer, data[1], FROM_LE_32(wave_hdr.samples_per_sec), flags, 127, 0);
+ return _mixer->playRaw(handle, buffer, data[1], FROM_LE_32(wave_hdr.samples_per_sec), flags, 255, 0);
}
int VocSound::playSound(uint sound, PlayingSoundHandle *handle, byte flags) {
@@ -212,7 +212,7 @@ int VocSound::playSound(uint sound, PlayingSoundHandle *handle, byte flags) {
byte *buffer = (byte *)malloc(size);
_file->read(buffer, size);
- return _mixer->playRaw(handle, buffer, size, samples_per_sec, flags, 127, 0);
+ return _mixer->playRaw(handle, buffer, size, samples_per_sec, flags, 255, 0);
}
int RawSound::playSound(uint sound, PlayingSoundHandle *handle, byte flags) {
@@ -226,7 +226,7 @@ int RawSound::playSound(uint sound, PlayingSoundHandle *handle, byte flags) {
byte *buffer = (byte *)malloc(size);
_file->read(buffer, size);
- return _mixer->playRaw(handle, buffer, size, 22050, flags, 127, 0);
+ return _mixer->playRaw(handle, buffer, size, 22050, flags, 255, 0);
}
#ifdef USE_MAD
diff --git a/sky/intro.cpp b/sky/intro.cpp
index 39b45716e2..5c4ab9968f 100644
--- a/sky/intro.cpp
+++ b/sky/intro.cpp
@@ -718,7 +718,7 @@ bool SkyIntro::nextPart(uint16 *&data) {
// directly, but this will have to do for now.
memset(vData, 127, sizeof(struct dataFileHeader));
_mixer->playRaw(&_voice, vData, _skyDisk->_lastLoadedFileSize, 11025,
- SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_UNSIGNED, SOUND_VOICE, 127, 0);
+ SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_UNSIGNED, 255, 0, SOUND_VOICE);
return true;
case WAITVOICE:
while (_voice)
@@ -735,12 +735,12 @@ bool SkyIntro::nextPart(uint16 *&data) {
case LOOPBG:
_mixer->stopID(SOUND_BG);
_mixer->playRaw(&_bgSfx, _bgBuf + 256, _bgSize - 768, 11025,
- SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_LOOP, 127, 0, SOUND_BG);
+ SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_LOOP, 255, 0, SOUND_BG);
return true;
case PLAYBG:
_mixer->stopID(SOUND_BG);
_mixer->playRaw(&_bgSfx, _bgBuf + 256, _bgSize - 768, 11025,
- SoundMixer::FLAG_UNSIGNED, SOUND_BG, 127, 0);
+ SoundMixer::FLAG_UNSIGNED, 255, 0, SOUND_BG);
return true;
case STOPBG:
_mixer->stopID(SOUND_BG);
diff --git a/sky/sound.cpp b/sky/sound.cpp
index d13b7db8ca..50de6293b3 100644
--- a/sky/sound.cpp
+++ b/sky/sound.cpp
@@ -1054,7 +1054,7 @@ int SkySound::playSound(uint32 id, byte *sound, uint32 size, PlayingSoundHandle
memcpy(buffer, sound+sizeof(struct dataFileHeader), size);
_mixer->stopID(id);
- return _mixer->playRaw(handle, buffer, size, 11025, flags, 127, 0, id);
+ return _mixer->playRaw(handle, buffer, size, 11025, flags, 255, 0, id);
}
void SkySound::loadSection(uint8 pSection) {
@@ -1130,9 +1130,9 @@ void SkySound::playSound(uint16 sound, uint16 volume, uint8 channel) {
_mixer->setVolume(volume);
if (channel == 0)
- _mixer->playRaw(&_ingameSound0, _soundData + dataOfs, dataSize, sampleRate, flags, 127, 0, SOUND_CH0, loopSta, loopEnd);
+ _mixer->playRaw(&_ingameSound0, _soundData + dataOfs, dataSize, sampleRate, flags, 255, 0, SOUND_CH0, loopSta, loopEnd);
else
- _mixer->playRaw(&_ingameSound1, _soundData + dataOfs, dataSize, sampleRate, flags, 127, 0, SOUND_CH1, loopSta, loopEnd);
+ _mixer->playRaw(&_ingameSound1, _soundData + dataOfs, dataSize, sampleRate, flags, 255, 0, SOUND_CH1, loopSta, loopEnd);
}
void SkySound::fnStartFx(uint32 sound, uint8 channel) {
@@ -1251,6 +1251,6 @@ bool SkySound::startSpeech(uint16 textNum) {
free(speechData);
_mixer->stopID(SOUND_SPEECH);
- _mixer->playRaw(&_ingameSpeech, playBuffer, speechSize, 11025, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE, 127, 0, SOUND_SPEECH);
+ _mixer->playRaw(&_ingameSpeech, playBuffer, speechSize, 11025, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE, 255, 0, SOUND_SPEECH);
return true;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 21:31:14 +0000