no idea how to get joy buttons 2 and 3 to function.

[proj16/16.git] / src / vgmtest.c

diff --git a/src/vgmtest.c b/src/vgmtest.c
index 5245604..131362c 100755 (executable)
--- a/src/vgmtest.c
+++ b/src/vgmtest.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669\r
+ * Copyright (C) 2012-2021 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -24,8 +24,14 @@
  */\r
 \r
 #include "src/lib/vgmsnd/vgmSnd.h"\r
-#include "src/lib/doslib/adlib.h"\r
-#include "src/lib/16_in.h"\r
+#include "src/lib/16_snd.h"\r
+//#include "src/lib/doslib/adlib.h"\r
+#include "src/lib/16_tail.h"\r
+#include "src/lib/16_pm.h"\r
+#include "src/lib/16_ca.h"\r
+#include "src/lib/16_mm.h"\r
+#include "src/lib/16_hc.h"\r
+#include "src/lib/16_dbg.h"\r
 \r
 void OPL2_Write(UINT8 reg, UINT8 data);\r
 UINT8 OPL2_ReadStatus(void);\r
@@ -34,44 +40,41 @@ void OPL2_Write(UINT8 reg, UINT8 data)
 {\r
        //ym3812_w(0, 0, reg);\r
        //ym3812_w(0, 1, data);\r
-       //opl2out(reg, data);\r
-       adlib_write((word) reg,(byte)data);\r
+       opl2out((word)reg, (word)data);\r
        return;\r
 }\r
 \r
 UINT8 OPL2_ReadStatus(void)\r
 {\r
-       //return(inp(ADLIB_FM_ADDRESS));\r
-       return (UINT8)adlib_read(0);\r
+       return(inp(ADLIB_FM_ADDRESS));\r
        //return ym3812_r(0, 0);\r
 }\r
 \r
 void\r
 main(int argc, char *argv[])\r
 {\r
-       global_game_variables_t gvar;\r
+       static global_game_variables_t gvar;\r
        VGM_FILE pee[9];\r
-       player_t player[MaxPlayers];\r
+       char bakapee[64] = "data/02.vgm";\r
 \r
-       //opl2out(0x105, 0x00);\r
-       /*if(!init_adlib())\r
-       {\r
-               printf("Cannot init library\n");\r
-               exit(-5);\r
-       }*/\r
-       OpenVGMFile("data/0.vgm", &pee[0]);\r
-       IN_Startup();\r
-       IN_Default(0,&player,ctrl_Joystick);\r
+       if(argv[1]) strcpy(bakapee, argv[1]);\r
+\r
+//     MM_Startup(&gvar);\r
+//     PM_Startup(&gvar); PM_UnlockMainMem(&gvar);\r
+//     CA_Startup(&gvar);\r
+       StartupCAMMPM(&gvar);\r
+       printf("%x\n", OpenVGMFile(bakapee, &pee[0], &gvar));\r
        InitEngine();\r
        PlayMusic(&pee[0]);\r
-       while(!IN_KeyDown(sc_Escape))\r
+       while(!kbhit())\r
        {\r
-               IN_ReadControl(0,&player);\r
                UpdateSoundEngine();\r
        }\r
        StopMusic();\r
-       FreeVGMFile(&pee[0]);\r
+       FreeVGMFile(&pee[0], &gvar); printf("ok\n");\r
        DeinitEngine();\r
-       //shutdown_adlib();\r
-       IN_Shutdown();\r
+//     PM_Shutdown(&gvar);\r
+//     CA_Shutdown(&gvar);\r
+//     MM_Shutdown(&gvar);\r
+       ShutdownCAMMPM(&gvar);\r
 }\r