mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r18833) -Cleanup: Const-ness and style

release/1.0
peter1138 2010-01-16 20:59:58 +00:00
parent c07c7a3818
commit 3a5e588f12
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/mixer.cpp
View File

@ -57,21 +57,15 @@ static int RateConversion(T *b, int frac_pos)
static void mix_int16(MixerChannel *sc, int16 *buffer, uint samples) static void mix_int16(MixerChannel *sc, int16 *buffer, uint samples)
{ {
int16 *b;
uint32 frac_pos;
uint32 frac_speed;
int volume_left;
int volume_right;
if (samples > sc->samples_left) samples = sc->samples_left; if (samples > sc->samples_left) samples = sc->samples_left;
sc->samples_left -= samples; sc->samples_left -= samples;
assert(samples > 0); assert(samples > 0);
b = (int16*)sc->memory + sc->pos; const int16 *b = (const int16 *)sc->memory + sc->pos;
frac_pos = sc->frac_pos; uint32 frac_pos = sc->frac_pos;
frac_speed = sc->frac_speed; uint32 frac_speed = sc->frac_speed;
volume_left = sc->volume_left; int volume_left = sc->volume_left;
volume_right = sc->volume_right; int volume_right = sc->volume_right;
if (frac_speed == 0x10000) { if (frac_speed == 0x10000) {
/* Special case when frac_speed is 0x10000 */ /* Special case when frac_speed is 0x10000 */
@ -94,26 +88,20 @@ static void mix_int16(MixerChannel *sc, int16 *buffer, uint samples)
} }
sc->frac_pos = frac_pos; sc->frac_pos = frac_pos;
sc->pos = b - (int16*)sc->memory; sc->pos = b - (const int16 *)sc->memory;
} }
static void mix_int8_to_int16(MixerChannel *sc, int16 *buffer, uint samples) static void mix_int8_to_int16(MixerChannel *sc, int16 *buffer, uint samples)
{ {
int8 *b;
uint32 frac_pos;
uint32 frac_speed;
int volume_left;
int volume_right;
if (samples > sc->samples_left) samples = sc->samples_left; if (samples > sc->samples_left) samples = sc->samples_left;
sc->samples_left -= samples; sc->samples_left -= samples;
assert(samples > 0); assert(samples > 0);
b = sc->memory + sc->pos; const int8 *b = sc->memory + sc->pos;
frac_pos = sc->frac_pos; uint32 frac_pos = sc->frac_pos;
frac_speed = sc->frac_speed; uint32 frac_speed = sc->frac_speed;
volume_left = sc->volume_left; int volume_left = sc->volume_left;
volume_right = sc->volume_right; int volume_right = sc->volume_right;
if (frac_speed == 0x10000) { if (frac_speed == 0x10000) {
/* Special case when frac_speed is 0x10000 */ /* Special case when frac_speed is 0x10000 */