diff options
| author | Filippos Karapetis | 2015-02-20 21:31:03 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2015-12-15 00:05:02 +0100 |
| commit | 2cd1c0d3fff098f84aca5cee912ac163b200dbad (patch) | |
| tree | d5b6f85e7a0d2eb7e35a0583772a1a5faa54654b | |
| parent | 7e0545cf6d3f4dd3628119cf61910be5ca0fb340 (diff) | |
| download | scummvm-rg350-2cd1c0d3fff098f84aca5cee912ac163b200dbad.tar.gz scummvm-rg350-2cd1c0d3fff098f84aca5cee912ac163b200dbad.tar.bz2 scummvm-rg350-2cd1c0d3fff098f84aca5cee912ac163b200dbad.zip | |
LAB: Clean up some DOS-specific code
| -rw-r--r-- | engines/lab/labmusic.cpp | 15 |
1 files 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 */ |