Merge remote-tracking branch 'upstream/master'

[16.git] / src / vgmtest.c

diff --git a/src/vgmtest.c b/src/vgmtest.c
index 18374d332278542c339ff279fa62dd757904f5ba..49752222de381b0f9ec6f1f10c8ced6226562451 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-2016 sparky4 & pngwen & andrius4669 & joncampbell123\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -35,15 +35,13 @@ 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 ym3812_r(0, 0);\r
 }\r
 \r
@@ -53,26 +51,24 @@ main(int argc, char *argv[])
        global_game_variables_t gvar;\r
        VGM_FILE pee[9];\r
        player_t player[MaxPlayers];\r
+       char *bakapee;\r
 \r
-       //opl2out(0x105, 0x00);\r
-       /*if(!init_adlib())\r
-       {\r
-               printf("Cannot init library\n");\r
-               exit(-5);\r
-       }*/\r
-       printf("%x\n", OpenVGMFile("data/0.vgm", &pee[0]));\r
+       bakapee = malloc(64);\r
+       if(argv[1]) bakapee = argv[1];\r
+       else bakapee = "data/adlib.vgm";\r
+       printf("%x\n", OpenVGMFile(bakapee, &pee[0]));\r
        IN_Startup();\r
        IN_Default(0,&player,ctrl_Joystick);\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
-       DeinitEngine();\r
-       //shutdown_adlib();\r
        IN_Shutdown();\r
+       DeinitEngine();\r
 }\r