diff options
| author | Johannes Schickel | 2006-01-13 23:06:04 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2006-01-13 23:06:04 +0000 |
| commit | d2de796c31f2c6057d4842f8131c154b10fae4f7 (patch) | |
| tree | 362a79cc34c02c50d3af55363b3196cb78cf14b7 /kyra/seqplayer.cpp | |
| parent | d04475121e29e567dd24085ee1541d92c4e865b3 (diff) | |
| download | scummvm-rg350-d2de796c31f2c6057d4842f8131c154b10fae4f7.tar.gz scummvm-rg350-d2de796c31f2c6057d4842f8131c154b10fae4f7.tar.bz2 scummvm-rg350-d2de796c31f2c6057d4842f8131c154b10fae4f7.zip | |
Reorganized the sound code a bit and fixed bug # 1404414 (Missing speech patterns).
svn-id: r20006
Diffstat (limited to 'kyra/seqplayer.cpp')
| -rwxr-xr-x | kyra/seqplayer.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/kyra/seqplayer.cpp b/kyra/seqplayer.cpp index 618cdcd571..02ef64b7da 100755 --- a/kyra/seqplayer.cpp +++ b/kyra/seqplayer.cpp @@ -42,7 +42,7 @@ SeqPlayer::SeqPlayer(KyraEngine* vm, OSystem* system) { _system = system; _screen = vm->screen(); - _midi = vm->midi(); + _sound = vm->sound(); _res = vm->resource(); _copyViewOffs = false; @@ -374,7 +374,7 @@ void SeqPlayer::s1_fillRect() { void SeqPlayer::s1_playEffect() { uint8 track = *_seqData++; _vm->waitTicks(3); - _midi->playSoundEffect(track); + _sound->playSoundEffect(track); } void SeqPlayer::s1_playTrack() { @@ -387,7 +387,7 @@ void SeqPlayer::s1_playTrack() { // nothing to do here... break; case 1: - _midi->beginFadeOut(); + _sound->beginFadeOut(); break; case 56: _vm->snd_playTheme(KyraEngine::MUSIC_INTRO, 3); @@ -406,7 +406,7 @@ void SeqPlayer::s1_playTrack() { if (msg == 0) { // nothing to do here... } else if (msg == 1) { - _midi->beginFadeOut(); + _sound->beginFadeOut(); } else { _vm->snd_playTrack(msg); } @@ -445,9 +445,7 @@ void SeqPlayer::s1_loadIntroVRM() { } void SeqPlayer::s1_playVocFile() { - while (_vm->snd_voicePlaying()) { - _system->delayMillis(10); - } + _vm->snd_voiceWaitForFinish(false); uint8 a = *_seqData++; _vm->snd_playVoiceFile(a); } |