synced with scummvm

svn-id: r4821
This commit is contained in:
Paweł Kołodziejski 2002-08-24 15:31:37 +00:00
parent fa181fcd8b
commit 9f993a1d29
46 changed files with 5117 additions and 371 deletions

View file

@ -1467,7 +1467,7 @@ void SmushPlayer::startVideo(short int arg, byte *videoFile) {
for (idx = 0; idx < MAX_STREAMER; idx++) {
if (_imusTrk[idx] != 0) {
if (_imusNewMixer[idx]) {
_scumm->_mixer->play_stream(NULL, idx, _imusBuf[idx], _imusFinalSize[idx], _imusRate[idx], _imusFlags[idx]);
_scumm->_mixer->playStream(NULL, idx, _imusBuf[idx], _imusFinalSize[idx], _imusRate[idx], _imusFlags[idx]);
} else {
_scumm->_mixer->append(idx, _imusBuf[idx], _imusFinalSize[idx], _imusRate[idx], _imusFlags[idx]);
}
@ -1479,7 +1479,7 @@ void SmushPlayer::startVideo(short int arg, byte *videoFile) {
for (idx = 0; idx < MAX_STREAMER; idx++) {
if (_psadTrk[idx] != 0) {
if (_strkNewMixer[idx]) {
_scumm->_mixer->play_stream(NULL, idx, _strkBuf[idx], _strkFinalSize[idx], _strkRate[idx], SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
_scumm->_mixer->playStream(NULL, idx, _strkBuf[idx], _strkFinalSize[idx], _strkRate[idx], SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
} else {
_scumm->_mixer->append(idx, _strkBuf[idx], _strkFinalSize[idx], _strkRate[idx], SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
}