X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fplugin.c;h=c3c104af3945193dd1c39391885f1a92dbcb16d7;hb=38b8a211aad8d2c485ccf0c0cbb58d965aac3483;hp=a0942df4f20511d10678a36dc2869658895a7733;hpb=d6a231b7c91ec99ddacfb2538ae8dc1286b10b82;p=pcsx_rearmed.git

diff --git a/frontend/plugin.c b/frontend/plugin.c
index a0942df4..c3c104af 100644
--- a/frontend/plugin.c
+++ b/frontend/plugin.c
@@ -46,20 +46,7 @@ static long CALLBACK CDRgetTE(unsigned char _, unsigned char *__, unsigned char
 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)(void));
-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 +122,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 *);
 extern void GPUupdateLace(void);
 extern long GPUfreeze(uint32_t, void *);
 extern void GPUvBlank(int, int);
@@ -191,6 +178,7 @@ static const struct {
 	DIRECT_SPU(SPUregisterScheduleCb),
 	DIRECT_SPU(SPUasync),
 	DIRECT_SPU(SPUplayCDDAchannel),
+	DIRECT_SPU(SPUsetCDvol),
 	/* PAD */
 	DIRECT_PAD(PADinit),
 	DIRECT_PAD(PADshutdown),
@@ -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);