VICTORY IS MINE!!!! WWWW

	modified:   exmmtest.map
	modified:   scroll.map
	modified:   src/lib/vgmsnd/common.h
	modified:   src/lib/vgmsnd/vgmSnd.c
	modified:   src/lib/vgmsnd/vgmSnd.h
	modified:   vgmtest.exe

diff --git a/exmmtest.map b/exmmtest.map
index 4378b0f27fdf21a1f8a8cb43cec69de1133243f1..436b9573c6e097561fd986526bca71ac4ca98704 100755 (executable)
--- a/exmmtest.map
+++ b/exmmtest.map
@@ -1,6 +1,6 @@
 Open Watcom Linker Version 1.9
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/09/12 03:14:20
+Created on:       15/09/12 12:47:11
 Executable Image: exmmtest.exe
 creating a DOS executable
 
@@ -495,4 +495,4 @@ Module: /usr/watcom/lib286/dos/clibc.lib(clearenv.c)
 Stack size:  8000 (32768.)
 Memory size:  00011e70 (73328.)
 Entry point address: 0000:47f4
-Link time: 00:00.02
+Link time: 00:00.01

diff --git a/scroll.map b/scroll.map
index 4158d71c9caa6d8a88602206a7cbeabd9bb4e0a4..22f0e8007f4a78cff24fa19b67fd4932749a9523 100755 (executable)
--- a/scroll.map
+++ b/scroll.map
@@ -1,6 +1,6 @@
 Open Watcom Linker Version 1.9
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/09/12 03:14:21
+Created on:       15/09/12 12:47:11
 Executable Image: scroll.exe
 creating a DOS executable
 
@@ -600,4 +600,4 @@ Module: /usr/watcom/lib286/dos/clibc.lib(hugeval.c)
 Stack size:  8000 (32768.)
 Memory size:  000164b0 (91312.)
 Entry point address: 0000:5fe4
-Link time: 00:00.03
+Link time: 00:00.02

diff --git a/src/lib/vgmsnd/common.h b/src/lib/vgmsnd/common.h
index a25a046dfe1085b61a56496b1d1360ac8a0326d0..db4a26db3a8b78074efdc5421750d62e7c870789 100755 (executable)
--- a/src/lib/vgmsnd/common.h
+++ b/src/lib/vgmsnd/common.h
@@ -1,7 +1,7 @@
 #ifndef __COMMON_H__
 #define __COMMON_H__
 
-#include "src/lib/vgmsnd/stdtype.h"
+//#include "src/lib/vgmsnd/stdtype.h"
 //#include "src/lib/16_head.h"
 //#include "src/lib/vgmsnd/stdbool.h"
 

diff --git a/src/lib/vgmsnd/vgmSnd.c b/src/lib/vgmsnd/vgmSnd.c
index d501edd09f27e0df0e5218f257f7d84e469e1e44..d5e1cb2f2da100a5aef817e357f9959fc53a1597 100755 (executable)
--- a/src/lib/vgmsnd/vgmSnd.c
+++ b/src/lib/vgmsnd/vgmSnd.c
@@ -22,54 +22,54 @@
 typedef struct _vgm_file_header_base\r
 {\r
        sdword fccVGM;                  // 00\r
-       UINT32 lngEOFOffset;    // 04\r
-       UINT32 lngVersion;              // 08\r
-       UINT32 lngSkip1[2];             // 0C\r
-       UINT32 lngGD3Offset;    // 14\r
-       UINT32 lngTotalSamples; // 18\r
-       UINT32 lngLoopOffset;   // 1C\r
-       UINT32 lngLoopSamples;  // 20\r
-       UINT32 lngRate;                 // 24\r
-       UINT32 lngSkip2[3];             // 28\r
-       UINT32 lngDataOffset;   // 34\r
-       UINT32 lngSkip3[2];             // 38\r
+       sdword lngEOFOffset;    // 04\r
+       sdword lngVersion;              // 08\r
+       sdword lngSkip1[2];             // 0C\r
+       sdword lngGD3Offset;    // 14\r
+       sdword lngTotalSamples; // 18\r
+       sdword lngLoopOffset;   // 1C\r
+       sdword lngLoopSamples;  // 20\r
+       sdword lngRate;                 // 24\r
+       sdword lngSkip2[3];             // 28\r
+       sdword lngDataOffset;   // 34\r
+       sdword lngSkip3[2];             // 38\r
 } VGM_BASE_HDR;\r
 \r
 #define PBMODE_MUSIC   0x00\r
 #define PBMODE_SFX             0x01\r
 typedef struct _vgm_playback\r
 {\r
-       UINT8 pbMode;\r
-       UINT8 vgmEnd;   // 00 - running, 01 - finished, FF - not loaded\r
-       UINT16 curLoopCnt;\r
-       UINT32 vgmPos;\r
-       UINT32 vgmSmplPos;\r
-       UINT32 pbSmplPos;\r
+       byte pbMode;\r
+       byte vgmEnd;    // 00 - running, 01 - finished, FF - not loaded\r
+       sword/**/ curLoopCnt;\r
+       sdword vgmPos;\r
+       sdword vgmSmplPos;\r
+       sdword pbSmplPos;\r
        VGM_FILE* file;\r
 \r
        // oplChnMask:\r
        //      Music: mask of channels used/overridden by SFX\r
        //      SFX:   ID of channel used by SFX (all commands are forces to it)\r
-       UINT16 oplChnMask;\r
-       UINT8* oplRegCache;\r
-       UINT8 workRAM[0x04];\r
+       sword/**/ oplChnMask;\r
+       byte* oplRegCache;\r
+       byte workRAM[0x04];\r
 } VGM_PBK;\r
 \r
 \r
 \r
-INLINE UINT16 ReadLE16(const UINT8* buffer)\r
+INLINE sword/**/ ReadLE16(const byte* buffer)\r
 {\r
 #ifdef QUICK_READ\r
-       return *(UINT16*)buffer;\r
+       return *(sword/**/*)buffer;\r
 #else\r
        return (buffer[0x00] << 0) | (buffer[0x01] << 8);\r
 #endif\r
 }\r
 \r
-INLINE UINT32 ReadLE32(const UINT8* buffer)\r
+INLINE sdword ReadLE32(const byte* buffer)\r
 {\r
 #ifdef QUICK_READ\r
-       return *(UINT32*)buffer;\r
+       return *(sword*)buffer;\r
 #else\r
        return  (buffer[0x00] <<  0) | (buffer[0x01] <<  8) |\r
                        (buffer[0x02] << 16) | (buffer[0x03] << 24);\r
@@ -78,35 +78,35 @@ INLINE UINT32 ReadLE32(const UINT8* buffer)
 \r
 \r
 // Function Prototypes\r
-//UINT8 OpenVGMFile(const char* FileName, VGM_FILE* vgmFile);\r
+//byte OpenVGMFile(const char* FileName, VGM_FILE* vgmFile);\r
 //void FreeVGMFile(VGM_FILE* vgmFile);\r
 \r
 static boolean DoVgmLoop(VGM_PBK* vgmPlay);\r
-static void UpdateVGM(VGM_PBK* vgmPlay, UINT16 Samples);\r
+static void UpdateVGM(VGM_PBK* vgmPlay, sword/**/ Samples);\r
 \r
 //void InitEngine(void);\r
 //void DeinitEngine(void);\r
 \r
-//UINT8 PlayMusic(VGM_FILE* vgmFile);\r
-//UINT8 PlaySFX(VGM_FILE* vgmFile, UINT8 sfxChnID);\r
-//UINT8 StopMusic(void);\r
-//UINT8 StopSFX(UINT8 sfxChnID);       // Note: sfxChnID == 0xFF -> stop all SFX\r
-//UINT8 PauseMusic(void);\r
-//UINT8 ResumeMusic(void);\r
+//byte PlayMusic(VGM_FILE* vgmFile);\r
+//byte PlaySFX(VGM_FILE* vgmFile, byte sfxChnID);\r
+//byte StopMusic(void);\r
+//byte StopSFX(byte sfxChnID); // Note: sfxChnID == 0xFF -> stop all SFX\r
+//byte PauseMusic(void);\r
+//byte ResumeMusic(void);\r
 static void StartPlayback(VGM_PBK* vgmPb);\r
 static void StopPlayback(VGM_PBK* vgmPb);\r
 \r
-static void ym2413_write(VGM_PBK* vgmPb, UINT8 reg, UINT8 data);\r
-static void ym3812_write(VGM_PBK* vgmPb, UINT8 reg, UINT8 data);\r
-static void ym3512_write(VGM_PBK* vgmPb, UINT8 reg, UINT8 data);\r
-static void ymf262_write(VGM_PBK* vgmPb, UINT8 port, UINT8 reg, UINT8 data);\r
+static void ym2413_write(VGM_PBK* vgmPb, byte reg, byte data);\r
+static void ym3812_write(VGM_PBK* vgmPb, byte reg, byte data);\r
+static void ym3512_write(VGM_PBK* vgmPb, byte reg, byte data);\r
+static void ymf262_write(VGM_PBK* vgmPb, byte port, byte reg, byte data);\r
 \r
 //void UpdateSoundEngine(void);\r
 \r
 \r
 // Functions that must be supplied by external library\r
-extern void OPL2_Write(UINT8 reg, UINT8 data);\r
-extern UINT8 OPL2_ReadStatus(void);\r
+extern void OPL2_Write(byte reg, byte data);\r
+extern byte OPL2_ReadStatus(void);\r
 \r
 \r
 \r
@@ -119,32 +119,32 @@ extern UINT8 OPL2_ReadStatus(void);
 static VGM_PBK vgmPbMusic;\r
 static VGM_PBK vgmPbSFX[SFX_CHN_COUNT];\r
 \r
-static UINT8 oplRegs_Music[0x100];\r
-static UINT8 oplRegs_SFX[SFX_CHN_COUNT][0x0D]; // 20 23 40 43 60 63 80 83 E0 E3 C0 A0 B0\r
+static byte oplRegs_Music[0x100];\r
+static byte oplRegs_SFX[SFX_CHN_COUNT][0x0D];  // 20 23 40 43 60 63 80 83 E0 E3 C0 A0 B0\r
 \r
-static const UINT8 SFX_REGS[0x0D] =\r
+static const byte SFX_REGS[0x0D] =\r
 {      0x20, 0x23, 0x40, 0x43, 0x60, 0x63, 0x80, 0x83,\r
        0xE0, 0xE3, 0xC0, 0xA0, 0xB0};\r
-static const UINT8 SFX_REGS_REV[0x10] =        // 20/30 -> 0, 40/50 -> 2, ...\r
+static const byte SFX_REGS_REV[0x10] = // 20/30 -> 0, 40/50 -> 2, ...\r
 {      0xFF, 0xFF, 0x00, 0x00, 0x02, 0x02, 0x04, 0x04,\r
        0x06, 0x06, 0x0B, 0x0C, 0x0A, 0xFF, 0x08, 0x08};\r
-static const UINT8 CHN_OPMASK[0x09] =\r
+static const byte CHN_OPMASK[0x09] =\r
 {      0x00, 0x01, 0x02, 0x08, 0x09, 0x0A, 0x10, 0x11, 0x12};\r
-static const UINT8 CHN_OPMASK_REV[0x20] =\r
+static const byte CHN_OPMASK_REV[0x20] =\r
 {      0x00, 0x01, 0x02, 0x80, 0x81, 0x82, 0xFF, 0xFF,\r
        0x03, 0x04, 0x05, 0x83, 0x84, 0x85, 0xFF, 0xFF,\r
        0x06, 0x07, 0x08, 0x86, 0x87, 0x88, 0xFF, 0xFF,\r
        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};\r
 \r
 \r
-UINT8 OpenVGMFile(const char* FileName, VGM_FILE* vgmFile)\r
+byte OpenVGMFile(const char* FileName, VGM_FILE* vgmFile)\r
 {\r
        size_t hdrSize;\r
        size_t readEl;  // 'elements' read from file\r
        size_t bytesToRead;\r
        VGM_BASE_HDR vgmBaseHdr;\r
        FILE* hFile;\r
-       UINT32 CurPos;\r
+       sdword CurPos;\r
 \r
        memset(vgmFile, 0x00, sizeof(VGM_FILE));\r
 \r
@@ -171,7 +171,7 @@ UINT8 OpenVGMFile(const char* FileName, VGM_FILE* vgmFile)
        }\r
 \r
        vgmFile->dataLen = vgmBaseHdr.lngEOFOffset + 0x04;\r
-       vgmFile->data = (UINT8*)malloc(vgmFile->dataLen);\r
+       vgmFile->data = (byte*)malloc(vgmFile->dataLen);\r
        if (vgmFile->data == NULL)\r
        {\r
                fclose(hFile);\r
@@ -206,7 +206,7 @@ UINT8 OpenVGMFile(const char* FileName, VGM_FILE* vgmFile)
                CurPos = 0x40;\r
        hdrSize = sizeof(VGM_HEADER);\r
        if (hdrSize > CurPos)\r
-               memset((UINT8*)&vgmFile->header + CurPos, 0x00, hdrSize - CurPos);\r
+               memset((byte*)&vgmFile->header + CurPos, 0x00, hdrSize - CurPos);\r
 \r
        fclose(hFile);\r
        return 0x00;\r
@@ -237,16 +237,16 @@ static boolean DoVgmLoop(VGM_PBK* vgmPlay)
        return true;\r
 }\r
 \r
-static void UpdateVGM(VGM_PBK* vgmPlay, UINT16 Samples)\r
+static void UpdateVGM(VGM_PBK* vgmPlay, sword/**/ Samples)\r
 {\r
-       const UINT32 vgmLen = vgmPlay->file->dataLen;\r
-       const UINT8* vgmData = vgmPlay->file->data;\r
-       const UINT8* VGMPnt;\r
-       UINT32 VGMPos;\r
-       UINT32 VGMSmplPos;\r
-       UINT8 Command;\r
-       UINT8 blockType;\r
-       UINT32 blockLen;\r
+       const sdword vgmLen = vgmPlay->file->dataLen;\r
+       const byte* vgmData = vgmPlay->file->data;\r
+       const byte* VGMPnt;\r
+       sdword VGMPos;\r
+       sdword VGMSmplPos;\r
+       byte Command;\r
+       byte blockType;\r
+       sdword blockLen;\r
 \r
        vgmPlay->pbSmplPos += Samples;\r
        VGMPos = vgmPlay->vgmPos;\r
@@ -390,8 +390,8 @@ static void UpdateVGM(VGM_PBK* vgmPlay, UINT16 Samples)
 \r
 void InitEngine(void)\r
 {\r
-       UINT8 curSFX;\r
-       UINT8 curReg;\r
+       byte curSFX;\r
+       byte curReg;\r
 \r
        memset(oplRegs_Music, 0x00, 0x100);\r
        memset(&vgmPbMusic, 0x00, sizeof(VGM_PBK));\r
@@ -429,7 +429,7 @@ void InitEngine(void)
 \r
 void DeinitEngine(void)\r
 {\r
-       UINT8 curSFX;\r
+       byte curSFX;\r
 \r
        StopPlayback(&vgmPbMusic);\r
        for (curSFX = 0; curSFX < SFX_CHN_COUNT; curSFX ++)\r
@@ -441,7 +441,7 @@ void DeinitEngine(void)
 }\r
 \r
 \r
-UINT8 PlayMusic(VGM_FILE* vgmFile)\r
+byte PlayMusic(VGM_FILE* vgmFile)\r
 {\r
        VGM_PBK* vgmPb = &vgmPbMusic;\r
 \r
@@ -455,7 +455,7 @@ UINT8 PlayMusic(VGM_FILE* vgmFile)
        return 0x00;\r
 }\r
 \r
-UINT8 PlaySFX(VGM_FILE* vgmFile, UINT8 sfxChnID)\r
+byte PlaySFX(VGM_FILE* vgmFile, byte sfxChnID)\r
 {\r
        VGM_PBK* vgmPb;\r
 \r
@@ -474,13 +474,13 @@ UINT8 PlaySFX(VGM_FILE* vgmFile, UINT8 sfxChnID)
        return 0x00;\r
 }\r
 \r
-UINT8 StopMusic(void)\r
+byte StopMusic(void)\r
 {\r
        StopPlayback(&vgmPbMusic);\r
        return 0x00;\r
 }\r
 \r
-UINT8 StopSFX(UINT8 sfxChnID)\r
+byte StopSFX(byte sfxChnID)\r
 {\r
        if (sfxChnID == 0xFF)\r
        {\r
@@ -496,7 +496,7 @@ UINT8 StopSFX(UINT8 sfxChnID)
        return 0x00;\r
 }\r
 \r
-UINT8 PauseMusic(void)\r
+byte PauseMusic(void)\r
 {\r
        if (vgmPbMusic.vgmEnd == 0xFF)\r
                return 0xFF;    // not playing\r
@@ -511,7 +511,7 @@ UINT8 PauseMusic(void)
        return 0x00;\r
 }\r
 \r
-UINT8 ResumeMusic(void)\r
+byte ResumeMusic(void)\r
 {\r
        if (vgmPbMusic.vgmEnd == 0xFF)\r
                return 0xFF;    // not playing\r
@@ -544,7 +544,7 @@ static void StartPlayback(VGM_PBK* vgmPb)
 \r
        if (vgmPb->pbMode == PBMODE_SFX)\r
        {\r
-               UINT8 curReg;\r
+               byte curReg;\r
 \r
                curReg = 0xB0 | vgmPb->oplChnMask;\r
                if (oplRegs_Music[curReg] & 0x20)\r
@@ -563,8 +563,8 @@ static void StopPlayback(VGM_PBK* vgmPb)
 \r
        if (vgmPb->pbMode == PBMODE_MUSIC)\r
        {\r
-               UINT8 curReg;\r
-               UINT16 chnMask;\r
+               byte curReg;\r
+               sword/**/ chnMask;\r
 \r
                chnMask = 0x0001;\r
                for (curReg = 0xB0; curReg < 0xB9; curReg ++, chnMask <<= 1)\r
@@ -588,9 +588,9 @@ static void StopPlayback(VGM_PBK* vgmPb)
        }\r
        else //if (vgmPb->pbMode == PBMODE_SFX)\r
        {\r
-               UINT8 regID;\r
-               UINT8 curReg;\r
-               UINT8 opMask;\r
+               byte regID;\r
+               byte curReg;\r
+               byte opMask;\r
 \r
                curReg = 0xB0 | vgmPb->oplChnMask;\r
                if (vgmPb->oplRegCache[0x0C] & 0x20)\r
@@ -624,10 +624,10 @@ static void StopPlayback(VGM_PBK* vgmPb)
 \r
 \r
 \r
-static void OPL_CachedWrite(VGM_PBK* vgmPb, UINT8 reg, UINT8 data)\r
+static void OPL_CachedWrite(VGM_PBK* vgmPb, byte reg, byte data)\r
 {\r
-       UINT8 regChn;\r
-       UINT8 ramOfs;\r
+       byte regChn;\r
+       byte ramOfs;\r
 \r
        if (vgmPb->pbMode == PBMODE_MUSIC)\r
        {\r
@@ -689,12 +689,12 @@ static void OPL_CachedWrite(VGM_PBK* vgmPb, UINT8 reg, UINT8 data)
 }\r
 \r
 \r
-static void ym2413_write(VGM_PBK* vgmPb, UINT8 reg, UINT8 data)\r
+static void ym2413_write(VGM_PBK* vgmPb, byte reg, byte data)\r
 {\r
        return; // unsupported for now\r
 }\r
 \r
-static void ym3812_write(VGM_PBK* vgmPb, UINT8 reg, UINT8 data)\r
+static void ym3812_write(VGM_PBK* vgmPb, byte reg, byte data)\r
 {\r
        if (reg == 0x01)\r
        {\r
@@ -710,7 +710,7 @@ static void ym3812_write(VGM_PBK* vgmPb, UINT8 reg, UINT8 data)
        return;\r
 }\r
 \r
-static void ym3512_write(VGM_PBK* vgmPb, UINT8 reg, UINT8 data)\r
+static void ym3512_write(VGM_PBK* vgmPb, byte reg, byte data)\r
 {\r
        if ((reg & 0xE0) == 0xE0)\r
        {\r
@@ -728,7 +728,7 @@ static void ym3512_write(VGM_PBK* vgmPb, UINT8 reg, UINT8 data)
        return;\r
 }\r
 \r
-static void ymf262_write(VGM_PBK* vgmPb, UINT8 port, UINT8 reg, UINT8 data)\r
+static void ymf262_write(VGM_PBK* vgmPb, byte port, byte reg, byte data)\r
 {\r
        return; // unsupported for now\r
 }\r
@@ -737,8 +737,8 @@ static void ymf262_write(VGM_PBK* vgmPb, UINT8 port, UINT8 reg, UINT8 data)
 \r
 void UpdateSoundEngine(void)\r
 {\r
-       UINT8 tmrMask;\r
-       UINT8 curSFX;\r
+       byte tmrMask;\r
+       byte curSFX;\r
 \r
        tmrMask = OPL2_ReadStatus();\r
        if (! (tmrMask & 0x40))\r

diff --git a/src/lib/vgmsnd/vgmSnd.h b/src/lib/vgmsnd/vgmSnd.h
index 0a886bc81d6e02e22031494bbc017aee2fd3d482..f48e237130d8c0d05795dd2fdad393d3355e5789 100755 (executable)
--- a/src/lib/vgmsnd/vgmSnd.h
+++ b/src/lib/vgmsnd/vgmSnd.h
@@ -6,75 +6,75 @@ extern "C"
 {\r
 #endif\r
 \r
-#include "src/lib/vgmsnd/stdtype.h"\r
+//#include "src/lib/vgmsnd/stdtype.h"\r
 #include "src/lib/16_head.h"\r
 \r
 typedef struct _vgm_file_header\r
 {\r
        sdword fccVGM;\r
-       UINT32 lngEOFOffset;\r
-       UINT32 lngVersion;\r
-       UINT32 lngHzPSG;\r
-       UINT32 lngHzYM2413;\r
-       UINT32 lngGD3Offset;\r
-       UINT32 lngTotalSamples;\r
-       UINT32 lngLoopOffset;\r
-       UINT32 lngLoopSamples;\r
-       UINT32 lngRate;\r
-       UINT8 bytPSGCfg[4];\r
-       UINT32 lngHzYM2612;\r
-       UINT32 lngHzYM2151;\r
-       UINT32 lngDataOffset;\r
-       UINT32 lngHzSPCM;\r
-       UINT32 lngSPCMIntf;\r
-       UINT32 lngHzRF5C68;\r
-       UINT32 lngHzYM2203;\r
-       UINT32 lngHzYM2608;\r
-       UINT32 lngHzYM2610;\r
-       UINT32 lngHzYM3812;\r
-       UINT32 lngHzYM3526;\r
-       UINT32 lngHzY8950;\r
-       UINT32 lngHzYMF262;\r
-       UINT32 lngHzYMF278B;\r
-       UINT32 lngHzYMF271;\r
-       UINT32 lngHzYMZ280B;\r
-       UINT32 lngHzRF5C164;\r
-       UINT32 lngHzPWM;\r
-       UINT32 lngHzAY8910;\r
-       UINT8 bytAYCfg[4];\r
-       UINT8 bytVolumeModifier;\r
-       UINT8 bytReserved2;\r
-       INT8 bytLoopBase;\r
-       UINT8 bytLoopModifier;\r
+       sdword lngEOFOffset;\r
+       sdword lngVersion;\r
+       sdword lngHzPSG;\r
+       sdword lngHzYM2413;\r
+       sdword lngGD3Offset;\r
+       sdword lngTotalSamples;\r
+       sdword lngLoopOffset;\r
+       sdword lngLoopSamples;\r
+       sdword lngRate;\r
+       byte bytPSGCfg[4];\r
+       sdword lngHzYM2612;\r
+       sdword lngHzYM2151;\r
+       sdword lngDataOffset;\r
+       sdword lngHzSPCM;\r
+       sdword lngSPCMIntf;\r
+       sdword lngHzRF5C68;\r
+       sdword lngHzYM2203;\r
+       sdword lngHzYM2608;\r
+       sdword lngHzYM2610;\r
+       sdword lngHzYM3812;\r
+       sdword lngHzYM3526;\r
+       sdword lngHzY8950;\r
+       sdword lngHzYMF262;\r
+       sdword lngHzYMF278B;\r
+       sdword lngHzYMF271;\r
+       sdword lngHzYMZ280B;\r
+       sdword lngHzRF5C164;\r
+       sdword lngHzPWM;\r
+       sdword lngHzAY8910;\r
+       byte bytAYCfg[4];\r
+       byte bytVolumeModifier;\r
+       byte bytReserved2;\r
+       char bytLoopBase;\r
+       byte bytLoopModifier;\r
 } VGM_HEADER;\r
 \r
 typedef struct _vgm_file\r
 {\r
-       UINT32 dataLen;\r
-       UINT8* data;\r
+       sdword dataLen;\r
+       byte* data;\r
        VGM_HEADER header;\r
 } VGM_FILE;\r
 \r
 \r
-UINT8 OpenVGMFile(const char* FileName, VGM_FILE* vgmFile);\r
+byte OpenVGMFile(const char* FileName, VGM_FILE* vgmFile);\r
 void FreeVGMFile(VGM_FILE* vgmFile);\r
 \r
 void InitEngine(void);\r
 void DeinitEngine(void);\r
 \r
-UINT8 PlayMusic(VGM_FILE* vgmFile);\r
-UINT8 PlaySFX(VGM_FILE* vgmFile, UINT8 sfxChnID);\r
-UINT8 StopMusic(void);\r
-UINT8 StopSFX(UINT8 sfxChnID);\r
-UINT8 PauseMusic(void);\r
-UINT8 ResumeMusic(void);\r
+byte PlayMusic(VGM_FILE* vgmFile);\r
+byte PlaySFX(VGM_FILE* vgmFile, byte sfxChnID);\r
+byte StopMusic(void);\r
+byte StopSFX(byte sfxChnID);\r
+byte PauseMusic(void);\r
+byte ResumeMusic(void);\r
 \r
 void UpdateSoundEngine(void);\r
 \r
 \r
 // Functions that must be supplied by external library:\r
-extern void OPL2_Write(UINT8 reg, UINT8 data);\r
-extern UINT8 OPL2_ReadStatus(void);\r
+extern void OPL2_Write(byte reg, byte data);\r
+extern byte OPL2_ReadStatus(void);\r
 \r
 \r
 #ifdef __cplusplus\r

diff --git a/vgmtest.exe b/vgmtest.exe
index 0bd222da541545abf223a37d0126ac61338c694d..cec5f8c7d7746591ea3c87edc4ae00c17efb80a9 100755 (executable)
Binary files a/vgmtest.exe and b/vgmtest.exe differ