pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed some unused variables that gcc 4.6.1 complains about.

Browse source
This commit is contained in:
Ryan C. Gordon 2012-08-09 14:14:41 -04:00
parent 4f18aa19f5
commit 8912814135
10 changed files with 33 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/audio/SDL_audio.c
View file

@ -314,7 +314,6 @@ SDL_RunAudio(void *devicep)
int stream_len;
void *udata;
void (SDLCALL * fill) (void *userdata, Uint8 * stream, int len);
int silence;
Uint32 delay;
/* For streaming when the buffer sizes don't match up */
Uint8 *istream;
@ -335,12 +334,6 @@ SDL_RunAudio(void *devicep)
device->use_streamer = 0;
if (device->convert.needed) {
if (device->convert.src_format == AUDIO_U8) {
silence = 0x80;
} else {
silence = 0;
}
#if 0 /* !!! FIXME: I took len_div out of the structure. Use rate_incr instead? */
/* If the result of the conversion alters the length, i.e. resampling is being used, use the streamer */
if (device->convert.len_mult != 1 || device->convert.len_div != 1) {
@ -367,7 +360,6 @@ SDL_RunAudio(void *devicep)
/* stream_len = device->convert.len; */
stream_len = device->spec.size;
} else {
silence = device->spec.silence;
stream_len = device->spec.size;
}

6
src/audio/SDL_wave.c
View file

@ -49,7 +49,6 @@ static int
InitMS_ADPCM(WaveFMT * format)
{
Uint8 *rogue_feel;
Uint16 extra_info;
int i;
/* Set the rogue pointer to the MS_ADPCM specific data */
@ -62,7 +61,7 @@ InitMS_ADPCM(WaveFMT * format)
SDL_SwapLE16(format->bitspersample);
rogue_feel = (Uint8 *) format + sizeof(*format);
if (sizeof(*format) == 16) {
extra_info = ((rogue_feel[1] << 8) | rogue_feel[0]);
/*const Uint16 extra_info = ((rogue_feel[1] << 8) | rogue_feel[0]);*/
rogue_feel += sizeof(Uint16);
}
MS_ADPCM_state.wSamplesPerBlock = ((rogue_feel[1] << 8) | rogue_feel[0]);
@ -233,7 +232,6 @@ static int
InitIMA_ADPCM(WaveFMT * format)
{
Uint8 *rogue_feel;
Uint16 extra_info;
/* Set the rogue pointer to the IMA_ADPCM specific data */
IMA_ADPCM_state.wavefmt.encoding = SDL_SwapLE16(format->encoding);
@ -245,7 +243,7 @@ InitIMA_ADPCM(WaveFMT * format)
SDL_SwapLE16(format->bitspersample);
rogue_feel = (Uint8 *) format + sizeof(*format);
if (sizeof(*format) == 16) {
extra_info = ((rogue_feel[1] << 8) | rogue_feel[0]);
/*const Uint16 extra_info = ((rogue_feel[1] << 8) | rogue_feel[0]);*/
rogue_feel += sizeof(Uint16);
}
IMA_ADPCM_state.wSamplesPerBlock = ((rogue_feel[1] << 8) | rogue_feel[0]);