From 73e8ac2a9b51fc4d278c87677b815f1f6c308775 Mon Sep 17 00:00:00 2001 From: Matthew Hoops Date: Tue, 21 Apr 2015 00:44:25 -0400 Subject: GOB: Use the built-in OPL timer --- engines/gob/sound/adlplayer.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'engines/gob/sound/adlplayer.cpp') 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() { -- cgit v1.2.3