diff options
| author | Max Horn | 2004-11-27 15:58:18 +0000 |
|---|---|---|
| committer | Max Horn | 2004-11-27 15:58:18 +0000 |
| commit | ba74a8e7f657cf795046a5cf6a7ead701fd4194e (patch) | |
| tree | 0d05c0dfa38e10542ca83ffeeb37ddd782c56ef7 /graphics | |
| parent | b78ac6a18b2cb851718ef84b04557f7fba8d399a (diff) | |
| download | scummvm-rg350-ba74a8e7f657cf795046a5cf6a7ead701fd4194e.tar.gz scummvm-rg350-ba74a8e7f657cf795046a5cf6a7ead701fd4194e.tar.bz2 scummvm-rg350-ba74a8e7f657cf795046a5cf6a7ead701fd4194e.zip | |
Added some more mixer doxygen docs; cleaned up Mixer API a bit, removing some very specialised methods
svn-id: r15914
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/animation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/animation.cpp b/graphics/animation.cpp index 42ac082ab9..2ce89fc838 100644 --- a/graphics/animation.cpp +++ b/graphics/animation.cpp @@ -174,7 +174,7 @@ bool BaseAnimationState::decodeFrame() { return false; if (checkPaletteSwitch() || (bgSoundStream == NULL) || - ((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum + 1) || + ((_snd->getSoundElapsedTime(bgSound) * 12) / 1000 < framenum + 1) || frameskipped > 10) { if (frameskipped > 10) { warning("force frame %i redraw", framenum); @@ -183,7 +183,7 @@ bool BaseAnimationState::decodeFrame() { drawYUV(sequence_i->width, sequence_i->height, info->display_fbuf->buf); if (bgSoundStream) { - while ((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum) + while ((_snd->getSoundElapsedTime(bgSound) * 12) / 1000 < framenum) _sys->delayMillis(10); } else { ticks += 83; |