libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-04 09:18:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for mixer 16 bits samples. Samples are clear now.

Browse Source 
bbrox: This patch works fine for me, previous not. (MSVC6 + SP5)

svn-id: r4368
This commit is contained in:
Paweł Kołodziejski 2002-05-22 05:55:10 +00:00
parent 162cd3a9c8
commit c9f67e27b3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/mixer.cpp
View File

@ -267,7 +267,7 @@ static void mix_signed_mono_16(int16 *data, uint len, byte **s_ptr, uint32 *fp_p
unsigned char volume = ((int) vol_tab[1]) * 32 / 255;
byte *s = *s_ptr;
do {
int16 sample = (int16) (((int32) ((*s << 8) | *(s + 1))) * volume / 32);
int16 sample = (((int16)(*s << 8) | *(s + 1)) * volume) / 32;
fp_pos += fp_speed;
*data++ += sample;
*data++ += sample;
@ -287,8 +287,8 @@ static void mix_signed_stereo_16(int16 *data, uint len, byte **s_ptr, uint32 *fp
byte *s = *s_ptr;
do {
fp_pos += fp_speed;
*data++ += (int16) ((((int32) ((*(s ) << 8) | *(s + 1))) * volume) / 32);
*data++ += (int16) ((((int32) ((*(s + 2) << 8) | *(s + 3))) * volume) / 32);
*data++ += (((int16)(*(s ) << 8) | *(s + 1)) * volume) / 32;
*data++ += (((int16)(*(s + 2) << 8) | *(s + 3)) * volume) / 32;
s += (fp_pos >> 16) << 2;
fp_pos &= 0x0000FFFF;
} while (--len);