diff options
| author | Jamieson Christian | 2003-08-16 09:34:19 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-08-16 09:34:19 +0000 |
| commit | 121b00a6f718f4b691c77708120083da2fedd018 (patch) | |
| tree | 9a28315710f3a7b870ccecd4637bb1fe78f4974a /scumm/imuse_player.cpp | |
| parent | 8281c2eecc64a1d4a97cc29e2f0af7bfc14cbf3a (diff) | |
| download | scummvm-rg350-121b00a6f718f4b691c77708120083da2fedd018.tar.gz scummvm-rg350-121b00a6f718f4b691c77708120083da2fedd018.tar.bz2 scummvm-rg350-121b00a6f718f4b691c77708120083da2fedd018.zip | |
Corrected timing mechanism for RO music streams.
RO streams have built-in timer markers (the
unknown 0xA0 mentioned in FR [742249]) that
override automated methods of updating
VAR_MUSIC_TIMER. Since these timer markers
do not seem to be present in AD resources, the
old mechanism is used if MD_ADLIB is the current
MidiDriver.
svn-id: r9720
Diffstat (limited to 'scumm/imuse_player.cpp')
| -rw-r--r-- | scumm/imuse_player.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scumm/imuse_player.cpp b/scumm/imuse_player.cpp index a85e7428a2..a754700b37 100644 --- a/scumm/imuse_player.cpp +++ b/scumm/imuse_player.cpp @@ -128,6 +128,10 @@ bool Player::startSound(int sound, MidiDriver *midi) { return true; } +uint32 Player::getMusicTimer() { + return _parser ? _parser->getTime() : 0; +} + bool Player::isFadingOut() { int i; for (i = 0; i < ARRAYSIZE(_parameterFaders); ++i) { |