diff options
| author | Matthew Hoops | 2015-04-21 00:44:25 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2015-07-07 20:19:45 -0400 |
| commit | 73e8ac2a9b51fc4d278c87677b815f1f6c308775 (patch) | |
| tree | 69fd4abb51e9fd9a8ba97d3d4cbe9af06daef36d /engines/gob/sound/adlplayer.cpp | |
| parent | 5b06eef1597ce701a4f6d16854be077b952d29f7 (diff) | |
| download | scummvm-rg350-73e8ac2a9b51fc4d278c87677b815f1f6c308775.tar.gz scummvm-rg350-73e8ac2a9b51fc4d278c87677b815f1f6c308775.tar.bz2 scummvm-rg350-73e8ac2a9b51fc4d278c87677b815f1f6c308775.zip | |
GOB: Use the built-in OPL timer
Diffstat (limited to 'engines/gob/sound/adlplayer.cpp')
| -rw-r--r-- | engines/gob/sound/adlplayer.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/engines/gob/sound/adlplayer.cpp b/engines/gob/sound/adlplayer.cpp index 384a928360..e5a276032b 100644 --- a/engines/gob/sound/adlplayer.cpp +++ b/engines/gob/sound/adlplayer.cpp @@ -28,7 +28,7 @@ namespace Gob { -ADLPlayer::ADLPlayer(Audio::Mixer &mixer) : AdLib(mixer), +ADLPlayer::ADLPlayer(Audio::Mixer &mixer) : AdLib(mixer, 1000), _songData(0), _songDataSize(0), _playPos(0) { } @@ -135,14 +135,7 @@ uint32 ADLPlayer::pollMusic(bool first) { if (delay & 0x80) delay = ((delay & 3) << 8) | *_playPos++; - return getSampleDelay(delay); -} - -uint32 ADLPlayer::getSampleDelay(uint16 delay) const { - if (delay == 0) - return 0; - - return ((uint32)delay * getSamplesPerSecond()) / 1000; + return delay; } void ADLPlayer::rewind() { |