it compiled!!

	new file:   data/0.vgm
	modified:   exmmtest.map
	modified:   makefile
	modified:   scroll.map
	modified:   src/lib/vgmsnd/3812intf.c
	modified:   src/lib/vgmsnd/vgmSnd.h
	modified:   src/vgmtest.c
	new file:   vgmtest.exe

diff --git a/data/0.vgm b/data/0.vgm
new file mode 100755 (executable)
index 0000000..fb4ee0c
Binary files /dev/null and b/data/0.vgm differ

diff --git a/exmmtest.map b/exmmtest.map
index c45532d9eec3e131aa057c23cfbecc43554691cd..a403d1946f11385d2bcd45446528b5da9123faf6 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/11 15:04:17
+Created on:       15/09/11 22:58:16
 Executable Image: exmmtest.exe
 creating a DOS executable
 

diff --git a/makefile b/makefile
index 213d0e69b8f2d28edee821fce21bc1aab18af985..4d6056e48c54ecd0ec8b706815141a1b59e0ba29 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -35,11 +35,11 @@ FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS)
 
 DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
-16LIBOBJS = bakapee.$(OBJ) 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) scroll16.$(OBJ) 16_ca.$(OBJ) timer.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) vgmSnd.$(OBJ)
+16LIBOBJS = bakapee.$(OBJ) 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) scroll16.$(OBJ) 16_ca.$(OBJ) timer.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) vgmSnd.$(OBJ) 16_snd.$(OBJ)
+#3812intf.$(OBJ)
 GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ)
 
-TESTEXEC =  exmmtest.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe tsthimem.exe inputest.exe scroll.exe
-#++++vgmtest.exe
+TESTEXEC =  exmmtest.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe tsthimem.exe inputest.exe scroll.exe vgmtest.exe
 #testemm.exe testemm0.exe fonttes0.exe miditest.exe sega.exe sountest.exe
 EXEC = 16.exe bakapi.exe $(TESTEXEC)
 
@@ -281,6 +281,9 @@ emm.$(OBJ): $(DOSLIB)emm.h $(DOSLIB)emm.c
 16_hc.$(OBJ): $(SRCLIB)16_hc.h $(SRCLIB)16_hc.c
        wcl $(FLAGS) -c $(SRCLIB)16_hc.c
 
+16_snd.$(OBJ): $(SRCLIB)16_snd.h $(SRCLIB)16_snd.c
+       wcl $(FLAGS) -c $(SRCLIB)16_snd.c
+
 jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c
        wcl $(FLAGS) -c $(JSMNLIB)jsmn.c
 
@@ -290,6 +293,9 @@ kitten.$(OBJ): $(NYANLIB)kitten.h $(NYANLIB)kitten.c
 vgmSnd.$(OBJ): $(VGMSNDLIB)vgmSnd.h $(VGMSNDLIB)vgmSnd.c
        wcl $(FLAGS) -c $(VGMSNDLIB)vgmSnd.c
 
+#3812intf.$(OBJ): $(VGMSNDLIB)3812intf.h $(VGMSNDLIB)3812intf.c
+#      wcl $(FLAGS) -c $(VGMSNDLIB)3812intf.c
+
 #farjsmn.$(OBJ): $(JSMNLIB)farjsmn.h $(JSMNLIB)farjsmn.c
 #      wcl $(FLAGS) $(MFLAGS) -c $(JSMNLIB)farjsmn.c
 

diff --git a/scroll.map b/scroll.map
index a8ad6aa0a16b319621752b1eb88dfa62dc8b1d48..3dbe0c435910deb36d9808e841f8b0f2ae562220 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/11 15:04:18
+Created on:       15/09/11 22:58:16
 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.02
+Link time: 00:00.01

diff --git a/src/lib/vgmsnd/3812intf.c b/src/lib/vgmsnd/3812intf.c
index 876bb5735c223579d1861bbdf27cf304a77411a1..7ebb8ef21b79a4688a261de37ff97eed739b7314 100755 (executable)
--- a/src/lib/vgmsnd/3812intf.c
+++ b/src/lib/vgmsnd/3812intf.c
@@ -17,9 +17,9 @@
 *\r
 ******************************************************************************/\r
 #include <stddef.h>\r
-#include "mamedef.h"\r
-#include "3812intf.h"\r
-#include "fmopl.h"\r
+//#include "src/lib/vgmsnd/mamedef.h"\r
+#include "src/lib/vgmsnd/3812intf.h"\r
+//#include "fmopl.h"\r
 \r
 \r
 typedef struct _ym3812_state ym3812_state;\r
@@ -53,10 +53,10 @@ int device_start_ym3812(UINT8 ChipID, int clock)
 {\r
        ym3812_state *info;\r
        int rate;\r
-       \r
+\r
        if (ChipID >= MAX_CHIPS)\r
                return 0;\r
-       \r
+\r
        info = &YM3812Data[ChipID];\r
        //rate = clock /72;\r
        rate = CHIP_SAMPLE_RATE;\r

diff --git a/src/lib/vgmsnd/vgmSnd.h b/src/lib/vgmsnd/vgmSnd.h
index 9fa78f64bec4d34fe18af435d81e2dd68a313642..0a886bc81d6e02e22031494bbc017aee2fd3d482 100755 (executable)
--- a/src/lib/vgmsnd/vgmSnd.h
+++ b/src/lib/vgmsnd/vgmSnd.h
@@ -73,8 +73,8 @@ void UpdateSoundEngine(void);
 \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(UINT8 reg, UINT8 data);\r
+extern UINT8 OPL2_ReadStatus(void);\r
 \r
 \r
 #ifdef __cplusplus\r

diff --git a/src/vgmtest.c b/src/vgmtest.c
index 6ba057e834c5c82aac0a5bc9fa2a7f6ba758acd4..03e0ec1e41bc5fe83e50eae52c21f4bc39d1b817 100755 (executable)
--- a/src/vgmtest.c
+++ b/src/vgmtest.c
@@ -24,16 +24,44 @@
  */\r
 \r
 #include "src/lib/vgmsnd/vgmSnd.h"\r
-#include "src/lib/vgmsnd/3812intf.h"\r
+#include "src/lib/16_snd.h"\r
+#include "src/lib/16_in.h"\r
 \r
-//#define VGM_SLOTS    4\r
+void OPL2_Write(UINT8 reg, UINT8 data);\r
+UINT8 OPL2_ReadStatus(void);\r
 \r
-//VGM_FILE vgmFiles[VGM_SLOTS];\r
+void OPL2_Write(UINT8 reg, UINT8 data)\r
+{\r
+       //ym3812_w(0, 0, reg);\r
+       //ym3812_w(0, 1, data);\r
+       opl2out(reg, data);\r
+       return;\r
+}\r
+\r
+UINT8 OPL2_ReadStatus(void)\r
+{\r
+       return 0;\r
+       //return ym3812_r(0, 0);\r
+}\r
 \r
-void main()\r
+void\r
+main(int argc, char *argv[])\r
 {\r
        global_game_variables_t gvar;\r
+       VGM_FILE pee;\r
+       player_t player[MaxPlayers];\r
+\r
        InitEngine();\r
+       OpenVGMFile("data\0.vgm", &pee);\r
+       IN_Startup();\r
+       IN_Default(0,&player,ctrl_Joystick);\r
+       PlayMusic(&pee);\r
+       while(!IN_KeyDown(sc_Escape))\r
+       {\r
+               IN_ReadControl(0,&player);\r
+               UpdateSoundEngine();\r
+       }\r
+       StopMusic();\r
        /*VGM_FILE* tempVgmFile;\r
        UINT8 vgmChn;\r
        UINT8 vgmId;\r
@@ -44,5 +72,7 @@ void main()
                PlayMusic(tempVgmFile);\r
        else\r
                PlaySFX(tempVgmFile, vgmChn);*/\r
+       FreeVGMFile(&pee);\r
        DeinitEngine();\r
+       IN_Shutdown();\r
 }\r

diff --git a/vgmtest.exe b/vgmtest.exe
new file mode 100755 (executable)
index 0000000..748dcc5
Binary files /dev/null and b/vgmtest.exe differ