diff options
| author | notaz | 2011-07-30 23:30:26 +0300 |
|---|---|---|
| committer | notaz | 2011-08-01 23:07:18 +0300 |
| commit | 9e7a735287d03149ccf7d0db6c0193cc565c3fff (patch) | |
| tree | 2d4c239f4112438b92a75a7bfa8294b58f8e318c /plugins/dfsound | |
| parent | 381ea10346ab85b2f2d46f33d28461211e239c0a (diff) | |
| download | pcsx_rearmed-9e7a735287d03149ccf7d0db6c0193cc565c3fff.tar.gz pcsx_rearmed-9e7a735287d03149ccf7d0db6c0193cc565c3fff.tar.bz2 pcsx_rearmed-9e7a735287d03149ccf7d0db6c0193cc565c3fff.zip | |
spu: change volume control, default it to 3/4 instead of 1/2
because some complain default volume is too low
Diffstat (limited to 'plugins/dfsound')
| -rw-r--r-- | plugins/dfsound/spu.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c index 7b435ac..b94fe90 100644 --- a/plugins/dfsound/spu.c +++ b/plugins/dfsound/spu.c @@ -79,7 +79,7 @@ unsigned char * pMixIrq=0; // user settings -int iVolume=3; +int iVolume=768; // 1024 is 1.0 int iXAPitch=1; int iUseTimer=2; int iSPUIRQWait=1; @@ -661,12 +661,8 @@ static int do_samples_noise(int ch, int ns, int ns_to) static void *MAINThread(void *arg) { + int volmult = iVolume; int ns,ns_from,ns_to; -#if !defined(_MACOSX) && !defined(__arm__) - int voldiv = iVolume; -#else - const int voldiv = 2; -#endif int ch,d; int bIRQReturn=0; @@ -837,12 +833,14 @@ static void *MAINThread(void *arg) else for (ns = 0; ns < NSSIZE*2; ) { - d = SSumLR[ns] / voldiv; SSumLR[ns] = 0; + d = SSumLR[ns]; SSumLR[ns] = 0; + d = d * volmult >> 10; ssat32_to_16(d); *pS++ = d; ns++; - d = SSumLR[ns] / voldiv; SSumLR[ns] = 0; + d = SSumLR[ns]; SSumLR[ns] = 0; + d = d * volmult >> 10; ssat32_to_16(d); *pS++ = d; ns++; @@ -1056,7 +1054,6 @@ long CALLBACK SPUinit(void) memset((void *)&rvb, 0, sizeof(REVERBInfo)); InitADSR(); - iVolume = 3; spuIrq = 0; spuAddr = 0xffffffff; bEndThread = 0; |