From 2cd1c0d3fff098f84aca5cee912ac163b200dbad Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Fri, 20 Feb 2015 21:31:03 +0200 Subject: LAB: Clean up some DOS-specific code --- engines/lab/labmusic.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/engines/lab/labmusic.cpp b/engines/lab/labmusic.cpp index 4efbd07722..2998b6230d 100644 --- a/engines/lab/labmusic.cpp +++ b/engines/lab/labmusic.cpp @@ -472,11 +472,8 @@ byte **Music::newOpen(const char *name) { if (_musicOn) { updateMusic(); -#if defined(DOSCODE) - LeftSecs = (getManyBuffersLeft() * MUSICBUFSIZE * 10) / SAMPLESPEED; -#else - LeftSecs = (getManyBuffersLeft() * MUSICBUFSIZE * 10) / (2 * SAMPLESPEED); -#endif + LeftSecs = (getManyBuffersLeft() * MUSICBUFSIZE * 10) / (2 * SAMPLESPEED); // Windows (16-bit) + //LeftSecs = (getManyBuffersLeft() * MUSICBUFSIZE * 10) / SAMPLESPEED; // DOS (8-bit) - TODO filelength = sizeOfFile(name) * 10; Time = 10 + /* Seek time for the music and the file */ @@ -511,11 +508,9 @@ void Music::fileCheckMusic(uint32 filelength) { if (_musicOn) { updateMusic(); -#if defined(DOSCODE) - LeftSecs = (getManyBuffersLeft() * MUSICBUFSIZE * 10) / SAMPLESPEED; -#else - LeftSecs = (getManyBuffersLeft() * MUSICBUFSIZE * 10) / (2 * SAMPLESPEED); -#endif + + LeftSecs = (getManyBuffersLeft() * MUSICBUFSIZE * 10) / (2 * SAMPLESPEED); // Windows (16-bit) + //LeftSecs = (getManyBuffersLeft() * MUSICBUFSIZE * 10) / SAMPLESPEED; // DOS (8-bit) - TODO filelength *= 10; Time = 5 + /* Seek time for the music */ -- cgit v1.2.3