X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvgmsnd%2FvgmSnd.c;h=2cfd8690c36a008a07cdd7df39d383de07a833f9;hb=adb425e17c32e33e71670dd69c909717f1d65acb;hp=1bd719f8c0a26f470d4379c6766816a206623748;hpb=0b144a0907c57f35e5d7ce1f1293afa802bb65cc;p=16.git

diff --git a/src/lib/vgmsnd/vgmSnd.c b/src/lib/vgmsnd/vgmSnd.c
index 1bd719f8..2cfd8690 100755
--- a/src/lib/vgmsnd/vgmSnd.c
+++ b/src/lib/vgmsnd/vgmSnd.c
@@ -137,7 +137,7 @@ static const UINT8 CHN_OPMASK_REV[0x20] =
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
 
 
-UINT8 OpenVGMFile(const char* FileName, VGM_FILE* vgmFile)
+UINT8 OpenVGMFile(const char* FileName, VGM_FILE* vgmFile, global_game_variables_t *gvar)
 {
 	size_t hdrSize;
 	size_t readEl;	// 'elements' read from file
@@ -171,7 +171,9 @@ UINT8 OpenVGMFile(const char* FileName, VGM_FILE* vgmFile)
 	}
 
 	vgmFile->dataLen = vgmBaseHdr.lngEOFOffset + 0x04;
-	vgmFile->data = (UINT8*)malloc(vgmFile->dataLen);
+	//vgmFile->data = (UINT8*)malloc(vgmFile->dataLen);
+	MM_GetPtr(MEMPTRCONV gvar->ca.audiosegs[0], vgmFile->dataLen, gvar);
+	vgmFile->data = (UINT8*)gvar->ca.audiosegs[0];
 	if (vgmFile->data == NULL)
 	{
 		fclose(hFile);
@@ -212,12 +214,14 @@ UINT8 OpenVGMFile(const char* FileName, VGM_FILE* vgmFile)
 	return 0x00;
 }
 
-void FreeVGMFile(VGM_FILE* vgmFile)
+void FreeVGMFile(VGM_FILE* vgmFile, global_game_variables_t *gvar)
 {
-	free(vgmFile->data);	vgmFile->data = NULL;
+	//if(vgmFile->data){ free(vgmFile->data);	vgmFile->data = NULL; }
+	MM_FreePtr(MEMPTRCONV gvar->ca.audiosegs[0], gvar);
+	if(vgmFile->data) free(vgmFile->data);
 	vgmFile->dataLen = 0;
 
-	return;
+//	return;
 }