From: notaz Date: Tue, 30 Aug 2022 00:00:51 +0000 (+0300) Subject: spu: get rid of iXAPitch X-Git-Tag: r24l~419 X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db3bfe5cdcd21f077c3f6bf8b82eb6676ddae8c0;p=pcsx_rearmed.git spu: get rid of iXAPitch it makes no sense after SPU was fully synced to the core, and now it just pulls unwanted windows.h dependency on win32. --- diff --git a/frontend/menu.c b/frontend/menu.c index 6a81edb2..46c4aa19 100644 --- a/frontend/menu.c +++ b/frontend/menu.c @@ -1474,7 +1474,7 @@ static menu_entry e_menu_plugin_spu[] = mee_range_h ("Volume boost", 0, volume_boost, -5, 30, h_spu_volboost), mee_onoff ("Reverb", 0, spu_config.iUseReverb, 1), mee_enum ("Interpolation", 0, spu_config.iUseInterpolation, men_spu_interp), - mee_onoff ("Adjust XA pitch", 0, spu_config.iXAPitch, 1), + //mee_onoff ("Adjust XA pitch", 0, spu_config.iXAPitch, 1), mee_onoff_h ("Adjust tempo", 0, spu_config.iTempo, 1, h_spu_tempo), mee_end, }; diff --git a/plugins/dfsound/xa.c b/plugins/dfsound/xa.c index c416d19a..c93612f8 100644 --- a/plugins/dfsound/xa.c +++ b/plugins/dfsound/xa.c @@ -94,6 +94,7 @@ INLINE void MixXA(int *SSumLR, int ns_to, int decode_pos) // small linux time helper... only used for watchdog //////////////////////////////////////////////////////////////////////// +#if 0 static unsigned long timeGetTime_spu() { #if defined(NO_OS) @@ -106,6 +107,7 @@ static unsigned long timeGetTime_spu() return tv.tv_sec * 1000 + tv.tv_usec/1000; // to do that, but at least it works #endif } +#endif //////////////////////////////////////////////////////////////////////// // FEED XA @@ -133,6 +135,7 @@ INLINE void FeedXA(xa_decode_t *xap) if(iPlace==0) return; // no place at all //----------------------------------------------------// +#if 0 if(spu_config.iXAPitch) // pitch change option? { static DWORD dwLT=0; @@ -169,6 +172,7 @@ INLINE void FeedXA(xa_decode_t *xap) if(iLastSize) iSize=iLastSize; } } +#endif //----------------------------------------------------// spos=0x10000L; @@ -179,6 +183,7 @@ INLINE void FeedXA(xa_decode_t *xap) uint32_t * pS=(uint32_t *)xap->pcm; uint32_t l=0; +#if 0 if(spu_config.iXAPitch) { int32_t l1,l2;short s; @@ -238,6 +243,7 @@ INLINE void FeedXA(xa_decode_t *xap) } } else +#endif { for(i=0;ipcm; uint32_t l;short s=0; +#if 0 if(spu_config.iXAPitch) { int32_t l1; @@ -337,6 +344,7 @@ INLINE void FeedXA(xa_decode_t *xap) } } else +#endif { for(i=0;i