X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fvgmtest.c;h=49752222de381b0f9ec6f1f10c8ced6226562451;hb=900779b8b2ce8c05c3df897d3ae3fa5d8cb414c6;hp=0c645bd6bd8f4f65fa28b6bcacb7915a1a260f42;hpb=47d006dd8d4ec2dca6619ce858980388a0225d0b;p=16.git

diff --git a/src/vgmtest.c b/src/vgmtest.c
index 0c645bd6..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.
  *
@@ -19,30 +19,56 @@
  * Fifth Floor, Boston, MA 02110-1301 USA.
  *
  */
-
-#include "src/lib/vgmsnd/vgmSnd.h"
-
 /*
  * soundtest
  */
 
-#define VGM_SLOTS	4
+#include "src/lib/vgmsnd/vgmSnd.h"
+#include "src/lib/16_snd.h"
+//#include "src/lib/doslib/adlib.h"
+#include "src/lib/16_in.h"
 
-VGM_FILE vgmFiles[VGM_SLOTS];
+void OPL2_Write(UINT8 reg, UINT8 data);
+UINT8 OPL2_ReadStatus(void);
 
-void main()
+void OPL2_Write(UINT8 reg, UINT8 data)
 {
-	InitEngine(void);
-	global_game_variables_t gvar;
-	VGM_FILE* tempVgmFile;
-	UINT8 vgmChn;
-	UINT8 vgmId;
+	//ym3812_w(0, 0, reg);
+	//ym3812_w(0, 1, data);
+	opl2out((word)reg, (word)data);
+	return;
+}
 
-	tempVgmFile = &vgmFiles[vgmId];
+UINT8 OPL2_ReadStatus(void)
+{
+	return(inp(ADLIB_FM_ADDRESS));
+	//return ym3812_r(0, 0);
+}
+
+void
+main(int argc, char *argv[])
+{
+	global_game_variables_t gvar;
+	VGM_FILE pee[9];
+	player_t player[MaxPlayers];
+	char *bakapee;
 
-	if (vgmChn == 0x7F)
-		PlayMusic(tempVgmFile);
-	else
-		PlaySFX(tempVgmFile, vgmChn);
-	DeinitEngine(void);
+	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]);
+	IN_Shutdown();
+	DeinitEngine();
 }