OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

audio/sdlaudio: remove unused variable

Browse Source 
Remove unused 'shift' variable spotted by clang.
Also clean up aud_to_sdlfmt which used to get the value
of shift.

Signed-off-by: Serge Ziryukin <ftrvxmtrx@gmail.com>
Signed-off-by: malc <av1474@comtv.ru>
This commit is contained in:
Serge Ziryukin 2010-04-22 14:14:24 +03:00 committed by malc
parent a6e4b14388
commit 6c557ab975
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
audio/sdlaudio.c
View File

@ -115,23 +115,19 @@ static int sdl_unlock_and_post (SDLAudioState *s, const char *forfn)
return sdl_post (s, forfn); return sdl_post (s, forfn);
} }
static int aud_to_sdlfmt (audfmt_e fmt, int *shift) static int aud_to_sdlfmt (audfmt_e fmt)
{ {
switch (fmt) { switch (fmt) {
case AUD_FMT_S8: case AUD_FMT_S8:
*shift = 0;
return AUDIO_S8; return AUDIO_S8;
case AUD_FMT_U8: case AUD_FMT_U8:
*shift = 0;
return AUDIO_U8; return AUDIO_U8;
case AUD_FMT_S16: case AUD_FMT_S16:
*shift = 1;
return AUDIO_S16LSB; return AUDIO_S16LSB;
case AUD_FMT_U16: case AUD_FMT_U16:
*shift = 1;
return AUDIO_U16LSB; return AUDIO_U16LSB;
default: default:
@ -326,16 +322,13 @@ static int sdl_init_out (HWVoiceOut *hw, struct audsettings *as)
SDLVoiceOut *sdl = (SDLVoiceOut *) hw; SDLVoiceOut *sdl = (SDLVoiceOut *) hw;
SDLAudioState *s = &glob_sdl; SDLAudioState *s = &glob_sdl;
SDL_AudioSpec req, obt; SDL_AudioSpec req, obt;
int shift;
int endianess; int endianess;
int err; int err;
audfmt_e effective_fmt; audfmt_e effective_fmt;
struct audsettings obt_as; struct audsettings obt_as;
shift <<= as->nchannels == 2;
req.freq = as->freq; req.freq = as->freq;
req.format = aud_to_sdlfmt (as->fmt, &shift); req.format = aud_to_sdlfmt (as->fmt);
req.channels = as->nchannels; req.channels = as->nchannels;
req.samples = conf.nb_samples; req.samples = conf.nb_samples;
req.callback = sdl_callback; req.callback = sdl_callback;