Merge SVN revision 84209 (by pal_Bazzi).

Makefile.psp

@@ -5,7 +5,11 @@ OBJS = adplug/binfile.o adplug/emuopl.o adplug/fprovide.o adplug/rix.o \
 	battle.o getopt.o main.o play.o script.o uigame.o ending.o \
 	global.o map.o res.o sound.o util.o fight.o input_PSP.o palcommon.o \
 	rixplay.o text.o video.o font.o itemmenu.o palette.o rngplay.o \
-	uibattle.o yj1.o game.o magicmenu.o scene.o ui.o
+	uibattle.o yj1.o game.o magicmenu.o scene.o ui.o \
+	libmad/bit.o libmad/decoder.o libmad/fixed.o libmad/frame.o \
+	libmad/huffman.o libmad/layer12.o libmad/layer3.o libmad/music_mad.o \
+	libmad/stream.o libmad/synth.o libmad/timer.o
+
 
 PSPSDK = $(shell psp-config --pspsdk-path)
 
@@ -23,4 +27,4 @@ PSP_EBOOT_TITLE = sdlpal
 BUILD_PRX = 1
 PSP_FW_VERSION = 371
 
-include $(PSPSDK)/lib/build.mak
+include $(PSPSDK)/lib/build.mak

main_PSP.h

@@ -45,16 +45,24 @@ int PSPExitCallback(int arg1, int arg2, void *common)
 //
 //Reopen MKF files when resume from suspend
 //
-int PSPSuspendCallback(int arg1, int arg2, void *common)
+int PSPSuspendCallback(int arg1, int pwrflags, void *common)
 {
   if (pwrflags & PSP_POWER_CB_RESUME_COMPLETE)
   {
+    UTIL_CloseFile(gpGlobals->f.fpFBP);
+    UTIL_CloseFile(gpGlobals->f.fpMGO);
+    UTIL_CloseFile(gpGlobals->f.fpBALL);
+    UTIL_CloseFile(gpGlobals->f.fpDATA);
+    UTIL_CloseFile(gpGlobals->f.fpF);
+    UTIL_CloseFile(gpGlobals->f.fpFIRE);
+    UTIL_CloseFile(gpGlobals->f.fpRGM);
+    UTIL_CloseFile(gpGlobals->f.fpSSS);
     gpGlobals->f.fpFBP = UTIL_OpenRequiredFile("fbp.mkf");
     gpGlobals->f.fpDATA = UTIL_OpenRequiredFile("data.mkf");
     gpGlobals->f.fpFIRE = UTIL_OpenRequiredFile("fire.mkf");
     gpGlobals->f.fpSSS = UTIL_OpenRequiredFile("sss.mkf");
     gpGlobals->lpObjectDesc = PAL_LoadObjectDesc(va("%s%s", PAL_PREFIX, "desc.dat"));
-    SOUND_Reload_VOC();
+    SOUND_ReloadVOC();
   }
   int cbid;
   cbid = sceKernelCreateCallback("suspend Callback", PSPSuspendCallback, NULL);

sound.c

@@ -403,6 +403,7 @@ SOUND_ReloadVOC(
 	void
 )
 {
+   fclose(gSndPlayer.mkf);
    gSndPlayer.mkf = fopen(va("%s%s", PAL_PREFIX, "voc.mkf"), "rb");
    g_fUseWav = FALSE;
 }