diff options
| author | SND\shalma_cp <SND\shalma_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-01-20 00:43:48 +0000 |
|---|---|---|
| committer | SND\shalma_cp <SND\shalma_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-01-20 00:43:48 +0000 |
| commit | 39481b5db7eb8925e78de91f72983000e36ce485 (patch) | |
| tree | eb2ce7ffa7e352d6fa9b96c581930284a5b98ab4 /plugins | |
| parent | a2ef180359e21a5e98cb6170ff2c1f67c7111bb7 (diff) | |
| download | pcsxr-39481b5db7eb8925e78de91f72983000e36ce485.tar.gz | |
remove old cdxa attenuation
- use cdda attenuation only
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@62214 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/dfsound/registers.c | 2 | ||||
| -rw-r--r-- | plugins/dfsound/xa.c | 21 |
2 files changed, 4 insertions, 19 deletions
diff --git a/plugins/dfsound/registers.c b/plugins/dfsound/registers.c index aabdacb2..72f305ee 100644 --- a/plugins/dfsound/registers.c +++ b/plugins/dfsound/registers.c @@ -266,12 +266,10 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val) break;
//-------------------------------------------------//
case H_CDLeft:
- // Attenuation: [$00-ff left][$00-ff right]
iLeftXAVol = val;
if(cddavCallback) cddavCallback(0,val);
break;
case H_CDRight:
- // Attenuation: [$00-ff right][$00-ff left]
iRightXAVol = val;
if(cddavCallback) cddavCallback(1,val);
break;
diff --git a/plugins/dfsound/xa.c b/plugins/dfsound/xa.c index fe3aee55..8246a8fe 100644 --- a/plugins/dfsound/xa.c +++ b/plugins/dfsound/xa.c @@ -75,16 +75,9 @@ static int lastcd_lc, lastcd_rc; INLINE void MixXA(void) { int ns;
- unsigned char val0,val1,val2,val3;
- short l,r;
int lc,rc;
unsigned long cdda_l;
- val0 = (iLeftXAVol>>8)&0xff;
- val1 = iLeftXAVol&0xff;
- val2 = (iRightXAVol>>8)&0xff;
- val3 = iRightXAVol&0xff;
-
lc = 0;
rc = 0;
@@ -93,11 +86,8 @@ INLINE void MixXA(void) XALastVal=*XAPlay++;
if(XAPlay==XAEnd) XAPlay=XAStart;
- l = XALastVal&0xffff;
- r = (XALastVal>>16) & 0xffff;
-
- lc=(l * val0 + r * val3) / 128;
- rc=(r * val2 + l * val1) / 128;
+ lc = (short)(XALastVal&0xffff);
+ rc = (short)((XALastVal>>16) & 0xffff);
if( lc < -32768 ) lc = -32768;
if( rc < -32768 ) rc = -32768;
@@ -142,11 +132,8 @@ INLINE void MixXA(void) cdda_l=*CDDAPlay++; if(CDDAPlay==CDDAEnd) CDDAPlay=CDDAStart;
- l = cdda_l&0xffff;
- r = (cdda_l>>16) & 0xffff;
-
- lc=(l * val0 + r * val3) / 128;
- rc=(r * val2 + l * val1) / 128;
+ lc = (short)(cdda_l&0xffff);
+ rc = (short)((cdda_l>>16) & 0xffff);
if( lc < -32768 ) lc = -32768;
if( rc < -32768 ) rc = -32768;
|