X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fvgmtest.c;h=49752222de381b0f9ec6f1f10c8ced6226562451;hb=e3b220f5349f8282bd426fdca00c64c8c7e831cd;hp=03e0ec1e41bc5fe83e50eae52c21f4bc39d1b817;hpb=f06d00600f804f121fe3a0b99ac85af4c5c75cbd;p=16.git

diff --git a/src/vgmtest.c b/src/vgmtest.c
index 03e0ec1e..49752222 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
  *
  * This file is part of Project 16.
  *
@@ -25,6 +25,7 @@
 
 #include "src/lib/vgmsnd/vgmSnd.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,13 +35,13 @@ void OPL2_Write(UINT8 reg, UINT8 data)
 {
 	//ym3812_w(0, 0, reg);
 	//ym3812_w(0, 1, data);
-	opl2out(reg, data);
+	opl2out((word)reg, (word)data);
 	return;
 }
 
 UINT8 OPL2_ReadStatus(void)
 {
-	return 0;
+	return(inp(ADLIB_FM_ADDRESS));
 	//return ym3812_r(0, 0);
 }
 
@@ -48,31 +49,26 @@ void
 main(int argc, char *argv[])
 {
 	global_game_variables_t gvar;
-	VGM_FILE pee;
+	VGM_FILE pee[9];
 	player_t player[MaxPlayers];
+	char *bakapee;
 
-	InitEngine();
-	OpenVGMFile("data\0.vgm", &pee);
+	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);
-	PlayMusic(&pee);
+	InitEngine();
+	PlayMusic(&pee[0]);
 	while(!IN_KeyDown(sc_Escape))
+	//while(!kbhit())
 	{
 		IN_ReadControl(0,&player);
 		UpdateSoundEngine();
 	}
 	StopMusic();
-	/*VGM_FILE* tempVgmFile;
-	UINT8 vgmChn;
-	UINT8 vgmId;
-
-	tempVgmFile = &vgmFiles[vgmId];
-
-	if (vgmChn == 0x7F)
-		PlayMusic(tempVgmFile);
-	else
-		PlaySFX(tempVgmFile, vgmChn);*/
-	FreeVGMFile(&pee);
-	DeinitEngine();
+	FreeVGMFile(&pee[0]);
 	IN_Shutdown();
+	DeinitEngine();
 }