From 62d01c541192615dcd2a3c47c1796159a61d92b6 Mon Sep 17 00:00:00 2001 From: JoseAaronLopezGarcia Date: Mon, 24 Jul 2023 15:30:04 +0200 Subject: [PATCH] cleanup --- extras/modules/peops/common.h | 14 -------------- extras/modules/peops/main.c | 15 ++++----------- extras/modules/peops/psp.c | 4 ---- extras/modules/peops/spu/spu.c | 4 ++-- 4 files changed, 6 insertions(+), 31 deletions(-) diff --git a/extras/modules/peops/common.h b/extras/modules/peops/common.h index eea4fe236..04f7fcc52 100644 --- a/extras/modules/peops/common.h +++ b/extras/modules/peops/common.h @@ -53,18 +53,4 @@ enum SPU_Priorities{ SPU_PRIORITY_VERY_HIGH = 4, }; -typedef struct -{ - /* PEOPS SPU configuration */ - int volume; - int reverb; - int interpolation; - int changexapitch; - int spuirqwait; - int spuupdatemode; - int sputhreadpriority; -} PeopsConfig; - -extern PeopsConfig config; - #endif diff --git a/extras/modules/peops/main.c b/extras/modules/peops/main.c index 3c310a3f8..e48e48db0 100644 --- a/extras/modules/peops/main.c +++ b/extras/modules/peops/main.c @@ -25,15 +25,8 @@ PSP_MODULE_INFO("peops", 0x0007, 1, 0); -PeopsConfig config = { - .volume = 3, - .reverb = REVERB_OFF, - .interpolation = INTERPOLATION_GAUSS, - .changexapitch = 0, - .spuirqwait = 1, - .spuupdatemode = SPU_WAITVBLANK, - .sputhreadpriority = SPU_PRIORITY_VERY_LOW, -}; +int spuupdatemode = SPU_WAITVBLANK; +int sputhreadpriority = SPU_PRIORITY_VERY_LOW; void (*previous)(void*); @@ -46,7 +39,7 @@ xa_decode_t cdr_xa; void SPUwait() { - switch(config.spuupdatemode) + switch(spuupdatemode) { case SPU_WAITVBLANK: sceDisplayWaitVblankStart(); @@ -80,7 +73,7 @@ void sceMeAudioInitPatched(int (* function)(), void *stack) static int priorities[] = { 17, 24, 32, 40, 48 }; - SceUID thid = sceKernelCreateThread("spu_thread", spu_thread, priorities[config.sputhreadpriority % (sizeof(priorities) / sizeof(int))], 0x4000, 0, NULL); + SceUID thid = sceKernelCreateThread("spu_thread", spu_thread, priorities[sputhreadpriority % (sizeof(priorities) / sizeof(int))], 0x4000, 0, NULL); if(thid >= 0) sceKernelStartThread(thid, 0, NULL); } diff --git a/extras/modules/peops/psp.c b/extras/modules/peops/psp.c index c8168d277..50113e1b5 100644 --- a/extras/modules/peops/psp.c +++ b/extras/modules/peops/psp.c @@ -51,8 +51,4 @@ unsigned long timeGetTime() void ReadConfig(void) { - iVolume = 4 - config.volume; - iXAPitch = config.changexapitch; - iUseReverb = config.reverb; - iUseInterpolation = config.interpolation; } \ No newline at end of file diff --git a/extras/modules/peops/spu/spu.c b/extras/modules/peops/spu/spu.c index d70768e8e..f8f95bc52 100644 --- a/extras/modules/peops/spu/spu.c +++ b/extras/modules/peops/spu/spu.c @@ -67,10 +67,10 @@ unsigned char * pMixIrq=0; // user settings -int iVolume=3; +int iVolume=1; int iXAPitch=1; int iUseTimer=0; -int iSPUIRQWait=0; +int iSPUIRQWait=1; int iDebugMode=0; int iRecordMode=0; int iUseReverb=0;