aboutsummaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorSerge Ziryukin <ftrvxmtrx@gmail.com>2010-04-22 14:14:24 +0300
committermalc <av1474@comtv.ru>2010-04-22 15:21:53 +0400
commit6c557ab975fc8e5edb4167a241266c7c4657054a (patch)
tree0ad2d029c92e51ecd1270c0de66c2ae80beb31c5 /audio
parenta6e4b143883b8504f6793966c36093354b38a889 (diff)
downloadqemu-6c557ab975fc8e5edb4167a241266c7c4657054a.zip
qemu-6c557ab975fc8e5edb4167a241266c7c4657054a.tar.gz
qemu-6c557ab975fc8e5edb4167a241266c7c4657054a.tar.bz2
audio/sdlaudio: remove unused variable
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>
Diffstat (limited to 'audio')
-rw-r--r--audio/sdlaudio.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c
index 8e7e5cb..c353016 100644
--- a/audio/sdlaudio.c
+++ b/audio/sdlaudio.c
@@ -115,23 +115,19 @@ static int sdl_unlock_and_post (SDLAudioState *s, const char *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) {
case AUD_FMT_S8:
- *shift = 0;
return AUDIO_S8;
case AUD_FMT_U8:
- *shift = 0;
return AUDIO_U8;
case AUD_FMT_S16:
- *shift = 1;
return AUDIO_S16LSB;
case AUD_FMT_U16:
- *shift = 1;
return AUDIO_U16LSB;
default:
@@ -326,16 +322,13 @@ static int sdl_init_out (HWVoiceOut *hw, struct audsettings *as)
SDLVoiceOut *sdl = (SDLVoiceOut *) hw;
SDLAudioState *s = &glob_sdl;
SDL_AudioSpec req, obt;
- int shift;
int endianess;
int err;
audfmt_e effective_fmt;
struct audsettings obt_as;
- shift <<= as->nchannels == 2;
-
req.freq = as->freq;
- req.format = aud_to_sdlfmt (as->fmt, &shift);
+ req.format = aud_to_sdlfmt (as->fmt);
req.channels = as->nchannels;
req.samples = conf.nb_samples;
req.callback = sdl_callback;