X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fvgmtest.c;h=131362c6f761ef0d3ee652616dab671b46dbc10e;hb=27341929f20173735232f3af6fe88a6176e2f7e6;hp=a4e5f7270496ba96597c2ff085cd30fb07a532a8;hpb=1b00b653e5ec0033f361a98043e5eb0d1ce16011;p=proj16%2F16.git

diff --git a/src/vgmtest.c b/src/vgmtest.c
index a4e5f727..131362c6 100755
--- a/src/vgmtest.c
+++ b/src/vgmtest.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2021 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -26,7 +26,12 @@
 #include "src/lib/vgmsnd/vgmSnd.h"
 #include "src/lib/16_snd.h"
 //#include "src/lib/doslib/adlib.h"
-#include "src/lib/16_in.h"
+#include "src/lib/16_tail.h"
+#include "src/lib/16_pm.h"
+#include "src/lib/16_ca.h"
+#include "src/lib/16_mm.h"
+#include "src/lib/16_hc.h"
+#include "src/lib/16_dbg.h"
 
 void OPL2_Write(UINT8 reg, UINT8 data);
 UINT8 OPL2_ReadStatus(void);
@@ -48,27 +53,28 @@ UINT8 OPL2_ReadStatus(void)
 void
 main(int argc, char *argv[])
 {
-	global_game_variables_t gvar;
+	static global_game_variables_t gvar;
 	VGM_FILE pee[9];
-	player_t player[MaxPlayers];
-	char *bakapee;
+	char bakapee[64] = "data/02.vgm";
 
-	bakapee = malloc(64);
-	if(argv[1]) bakapee = argv[1];
-	else bakapee = "data/0.vgm";
-	printf("%x\n", OpenVGMFile(bakapee, &pee[0]));
-	IN_Startup();
-	IN_Default(0,&player,ctrl_Joystick);
+	if(argv[1]) strcpy(bakapee, argv[1]);
+
+//	MM_Startup(&gvar);
+//	PM_Startup(&gvar); PM_UnlockMainMem(&gvar);
+//	CA_Startup(&gvar);
+	StartupCAMMPM(&gvar);
+	printf("%x\n", OpenVGMFile(bakapee, &pee[0], &gvar));
 	InitEngine();
 	PlayMusic(&pee[0]);
-	while(!IN_KeyDown(sc_Escape))
-	//while(!kbhit())
+	while(!kbhit())
 	{
-		IN_ReadControl(0,&player);
 		UpdateSoundEngine();
 	}
 	StopMusic();
-	FreeVGMFile(&pee[0]);
-	IN_Shutdown();
+	FreeVGMFile(&pee[0], &gvar); printf("ok\n");
 	DeinitEngine();
+//	PM_Shutdown(&gvar);
+//	CA_Shutdown(&gvar);
+//	MM_Shutdown(&gvar);
+	ShutdownCAMMPM(&gvar);
 }