mirror of
https://github.com/libretro/scummvm.git
synced 2025-03-05 01:38:36 +00:00
My last commit didn't work on big-endian. Maybe this one does...
svn-id: r11711
This commit is contained in:
parent
215c8e3fc6
commit
9a1bbb361b
@ -177,6 +177,12 @@ int32 MoviePlayer::play(char *filename, _movieTextObject *text[], uint8 *musicOu
|
||||
|
||||
bool skipCutscene = false;
|
||||
|
||||
uint32 flags = SoundMixer::FLAG_16BITS;
|
||||
|
||||
#ifndef SCUMM_BIG_ENDIAN
|
||||
flags |= SoundMixer::FLAG_LITTLE_ENDIAN;
|
||||
#endif
|
||||
|
||||
while (1) {
|
||||
if (!text[textCounter])
|
||||
break;
|
||||
@ -186,7 +192,7 @@ int32 MoviePlayer::play(char *filename, _movieTextObject *text[], uint8 *musicOu
|
||||
openTextObject(text[textCounter]);
|
||||
drawTextObject(text[textCounter]);
|
||||
if (text[textCounter]->speech) {
|
||||
_vm->_mixer->playRaw(&handle, text[textCounter]->speech, text[textCounter]->speechBufferSize, 22050, SoundMixer::FLAG_16BITS | SoundMixer::FLAG_LITTLE_ENDIAN);
|
||||
_vm->_mixer->playRaw(&handle, text[textCounter]->speech, text[textCounter]->speechBufferSize, 22050, flags);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -398,7 +398,11 @@ int32 Sound::playCompSpeech(const char *filename, uint32 speechid, uint8 vol, in
|
||||
|
||||
_speechPaused = true;
|
||||
|
||||
uint32 flags = SoundMixer::FLAG_16BITS | SoundMixer::FLAG_LITTLE_ENDIAN | SoundMixer::FLAG_AUTOFREE;
|
||||
uint32 flags = SoundMixer::FLAG_16BITS | SoundMixer::FLAG_AUTOFREE;
|
||||
|
||||
#ifndef SCUMM_BIG_ENDIAN
|
||||
flags |= SoundMixer::FLAG_LITTLE_ENDIAN;
|
||||
#endif
|
||||
|
||||
_vm->_mixer->playRaw(&_soundHandleSpeech, data16, bufferSize, 22050, flags, -1, volume, p);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user