X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplugin.c;h=d9eb04a40be1070f06700a79daf1293c6de16af8;hp=e9dbcacb2fe52c93d4c79b5519066223a74e9d0b;hb=HEAD;hpb=c2eee46bfb8a3fde297735a8b115330498d442b4

diff --git a/frontend/plugin.c b/frontend/plugin.c
index e9dbcacb..b3ad3bd9 100644
--- a/frontend/plugin.c
+++ b/frontend/plugin.c
@@ -41,25 +41,13 @@ static long CALLBACK CDRgetStatus(struct CdrStat *_) { return 0; }
 static char * CALLBACK CDRgetDriveLetter(void) { return NULL; }
 static long CALLBACK CDRreadCDDA(unsigned char _, unsigned char __, unsigned char ___, unsigned char *____) { return 0; }
 static long CALLBACK CDRgetTE(unsigned char _, unsigned char *__, unsigned char *___, unsigned char *____) { return 0; }
+static long CALLBACK CDRprefetch(unsigned char m, unsigned char s, unsigned char f) { return 1; }
 
 /* GPU */
 static void CALLBACK GPUdisplayText(char *_) { return; }
 
 /* SPU */
-extern long CALLBACK SPUopen(void);
-extern long CALLBACK SPUinit(void);
-extern long CALLBACK SPUshutdown(void);
-extern long CALLBACK SPUclose(void);
-extern void CALLBACK SPUwriteRegister(unsigned long, unsigned short, unsigned int);
-extern unsigned short CALLBACK SPUreadRegister(unsigned long, unsigned int);
-extern void CALLBACK SPUwriteDMAMem(unsigned short *, int, unsigned int);
-extern void CALLBACK SPUreadDMAMem(unsigned short *, int, unsigned int);
-extern void CALLBACK SPUplayADPCMchannel(void *, unsigned int, int);
-extern void CALLBACK SPUregisterCallback(void (*cb)(int));
-extern void CALLBACK SPUregisterScheduleCb(void (*cb)(unsigned int));
-extern long CALLBACK SPUfreeze(unsigned int, void *, unsigned int);
-extern void CALLBACK SPUasync(unsigned int, unsigned int);
-extern int  CALLBACK SPUplayCDDAchannel(short *, int, unsigned int, int);
+#include "../plugins/dfsound/spu.h"
 
 /* PAD */
 static long CALLBACK PADinit(long _) { return 0; }
@@ -135,7 +123,7 @@ extern void GPUwriteDataMem(uint32_t *, int);
 extern uint32_t GPUreadStatus(void);
 extern uint32_t GPUreadData(void);
 extern void GPUreadDataMem(uint32_t *, int);
-extern long GPUdmaChain(uint32_t *,uint32_t);
+extern long GPUdmaChain(uint32_t *, uint32_t, uint32_t *, int32_t *);
 extern void GPUupdateLace(void);
 extern long GPUfreeze(uint32_t, void *);
 extern void GPUvBlank(int, int);
@@ -176,6 +164,7 @@ static const struct {
 	DIRECT_CDR(CDRsetfilename),
 	DIRECT_CDR(CDRreadCDDA),
 	DIRECT_CDR(CDRgetTE),
+	DIRECT_CDR(CDRprefetch),
 	/* SPU */
 	DIRECT_SPU(SPUinit),
 	DIRECT_SPU(SPUshutdown),
@@ -191,6 +180,7 @@ static const struct {
 	DIRECT_SPU(SPUregisterScheduleCb),
 	DIRECT_SPU(SPUasync),
 	DIRECT_SPU(SPUplayCDDAchannel),
+	DIRECT_SPU(SPUsetCDvol),
 	/* PAD */
 	DIRECT_PAD(PADinit),
 	DIRECT_PAD(PADshutdown),
@@ -231,8 +221,6 @@ static const struct {
 	DIRECT_GPU(GPUkeypressed),
 	DIRECT_GPU(GPUmakeSnapshot),
 	DIRECT_GPU(GPUconfigure),
-	DIRECT_GPU(GPUtest),
-	DIRECT_GPU(GPUabout),
 	DIRECT_GPU(GPUgetScreenPic),
 	DIRECT_GPU(GPUshowScreenPic),
 */
@@ -264,6 +252,9 @@ void plugin_call_rearmed_cbs(void)
 	extern void *hGPUDriver;
 	void (*rearmed_set_cbs)(const struct rearmed_cbs *cbs);
 
+	pl_rearmed_cbs.screen_centering_type_default =
+		Config.hacks.gpu_centering ? C_INGAME : C_AUTO;
+
 	rearmed_set_cbs = SysLoadSym(hGPUDriver, "GPUrearmedCallbacks");
 	if (rearmed_set_cbs != NULL)
 		rearmed_set_cbs(&pl_rearmed_cbs);