what the fack? wwww

[16.git] / src / vgmtest.c

diff --git a/src/vgmtest.c b/src/vgmtest.c
index 569da02546acd696252c35dd2a6a571e482a7765..4657000daeb1a887285c5a85e3cfb7c06c4a82a3 100755 (executable)
--- a/src/vgmtest.c
+++ b/src/vgmtest.c
@@ -24,7 +24,7 @@
  */\r
 \r
 #include "src/lib/vgmsnd/vgmSnd.h"\r
-#include "src/lib/16_snd.h"\r
+#include "src/lib/doslib/adlib.h"\r
 #include "src/lib/16_in.h"\r
 \r
 void OPL2_Write(UINT8 reg, UINT8 data);\r
@@ -34,13 +34,15 @@ void OPL2_Write(UINT8 reg, UINT8 data)
 {\r
        //ym3812_w(0, 0, reg);\r
        //ym3812_w(0, 1, data);\r
-       opl2out(reg, data);\r
+       //opl2out(reg, data);\r
+       adlib_write((word) reg,(byte)data);\r
        return;\r
 }\r
 \r
 UINT8 OPL2_ReadStatus(void)\r
 {\r
-       return(inp(ADLIB_FM_ADDRESS));\r
+       //return(inp(ADLIB_FM_ADDRESS));\r
+       return (UINT8)adlib_read(0);\r
        //return ym3812_r(0, 0);\r
 }\r
 \r
@@ -48,21 +50,22 @@ void
 main(int argc, char *argv[])\r
 {\r
        global_game_variables_t gvar;\r
-       VGM_FILE pee;\r
+       VGM_FILE pee[9];\r
        player_t player[MaxPlayers];\r
 \r
+       //opl2out(0x105, 0x00);\r
        InitEngine();\r
-       OpenVGMFile("data/0.vgm", &pee);\r
+       OpenVGMFile("data/0.vgm", &pee[0]);\r
        IN_Startup();\r
        IN_Default(0,&player,ctrl_Joystick);\r
+       PlayMusic(&pee[0]);\r
        while(!IN_KeyDown(sc_Escape))\r
        {\r
-               PlayMusic(&pee);\r
                IN_ReadControl(0,&player);\r
                UpdateSoundEngine();\r
        }\r
        StopMusic();\r
-       FreeVGMFile(&pee);\r
+       FreeVGMFile(&pee[0]);\r
        DeinitEngine();\r
        IN_Shutdown();\r
 }\r