Fixed audio synchronization in the CD version of KQ5

svn-id: r40855
This commit is contained in:
Filippos Karapetis 2009-05-24 09:40:48 +00:00
parent 5a32f3f502
commit 8ab0f0256e
2 changed files with 8 additions and 3 deletions

View File

@ -1029,6 +1029,7 @@ bool findAudEntry(uint16 audioNumber, byte& volume, uint32& offset, uint32& size
// Used for speech playback in CD games
reg_t kDoAudio(EngineState *s, int funct_nr, int argc, reg_t *argv) {
Audio::Mixer *mixer = g_system->getMixer();
int sampleLen = 0;
switch (UKPV(0)) {
case kSci1AudioWPlay:
@ -1041,6 +1042,7 @@ reg_t kDoAudio(EngineState *s, int funct_nr, int argc, reg_t *argv) {
if (audioRes) {
audioStream = Audio::makeLinearInputStream(audioRes->data, audioRes->size, _audioRate, Audio::Mixer::FLAG_UNSIGNED, 0, 0);
sampleLen = audioRes->size * 60 / _audioRate;
} else {
// No patch file found, read it from the audio volume
byte volume;
@ -1070,13 +1072,16 @@ reg_t kDoAudio(EngineState *s, int funct_nr, int argc, reg_t *argv) {
Audio::Mixer::FLAG_AUTOFREE | Audio::Mixer::FLAG_UNSIGNED, 0, 0);
}
}
sampleLen = size * 60 / _audioRate;
}
}
if (audioStream)
mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_audioHandle, audioStream);
}
break;
return make_reg(0, sampleLen); // return sample length in ticks
case kSci1AudioStop:
mixer->stopHandle(_audioHandle);
break;
@ -1088,7 +1093,7 @@ reg_t kDoAudio(EngineState *s, int funct_nr, int argc, reg_t *argv) {
break;
case kSci1AudioPosition:
if (mixer->isSoundHandleActive(_audioHandle)) {
return make_reg(0, mixer->getSoundElapsedTime(_audioHandle) * 6 / 100); // return elapsed time in 1/60th
return make_reg(0, mixer->getSoundElapsedTime(_audioHandle) * 6 / 100); // return elapsed time in ticks
} else {
return make_reg(0, -1); // Sound finished
}

View File

@ -54,7 +54,7 @@ const char *sci_version_types[] = {
"SCI WIN/32"
};
const int sci_max_resource_nr[] = {65536, 1000, 2048, 2048, 2048, 8192, 8192, 65536};
const int sci_max_resource_nr[] = {65536, 1000, 2048, 2048, 2048, 65536, 65536, 65536};
const char *sci_error_types[] = {
"No error",