X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fvgmtest.c;h=c3a3c176c7b1065d751bbc267ca695c3f643c323;hb=bcc5413065af54b5895f24f0c89a518146d6d256;hp=c8e0d5537127d2825d610bff28827c8dbad7ee46;hpb=6d9dbde388b9c0183efc7fe1f461fa5083fe3fd0;p=16.git

diff --git a/src/vgmtest.c b/src/vgmtest.c
index c8e0d553..c3a3c176 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-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -24,7 +24,8 @@
  */
 
 #include "src/lib/vgmsnd/vgmSnd.h"
-#include "src/lib/doslib/adlib.h"
+#include "src/lib/16_snd.h"
+//#include "src/lib/doslib/adlib.h"
 #include "src/lib/16_in.h"
 
 void OPL2_Write(UINT8 reg, UINT8 data);
@@ -34,15 +35,13 @@ void OPL2_Write(UINT8 reg, UINT8 data)
 {
 	//ym3812_w(0, 0, reg);
 	//ym3812_w(0, 1, data);
-	//opl2out(reg, data);
-	adlib_write((word) reg,(byte)data);
+	opl2out((word)reg, (word)data);
 	return;
 }
 
 UINT8 OPL2_ReadStatus(void)
 {
-	//return(inp(ADLIB_FM_ADDRESS));
-	return (UINT8)adlib_read(0);
+	return(inp(ADLIB_FM_ADDRESS));
 	//return ym3812_r(0, 0);
 }
 
@@ -52,26 +51,24 @@ main(int argc, char *argv[])
 	global_game_variables_t gvar;
 	VGM_FILE pee[9];
 	player_t player[MaxPlayers];
+	char *bakapee;
 
-	//opl2out(0x105, 0x00);
-	if(!init_adlib())
-	{
-		printf("Cannot init library\n");
-		exit(-5);
-	}
-	InitEngine();
-	OpenVGMFile("data/0.vgm", &pee[0]);
+	bakapee = malloc(64);
+	if(argv[1]) bakapee = argv[1];
+	else bakapee = "data/adlib.vgm";
+	printf("%x\n", OpenVGMFile(bakapee, &pee[0]));
 	IN_Startup();
 	IN_Default(0,&player,ctrl_Joystick);
+	InitEngine();
 	PlayMusic(&pee[0]);
 	while(!IN_KeyDown(sc_Escape))
+	//while(!kbhit())
 	{
 		IN_ReadControl(0,&player);
 		UpdateSoundEngine();
 	}
 	StopMusic();
 	FreeVGMFile(&pee[0]);
-	DeinitEngine();
-	shutdown_adlib();
 	IN_Shutdown();
+	DeinitEngine();
 }