diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-11-21 14:36:55 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-11-21 14:36:55 -0600 |
commit | 1571b6cba25df6d000b2539b8ba399839d15f9b6 (patch) | |
tree | a9b92e81d01e08e76477127d1e3dae07eaeca212 /audio | |
parent | 54dcd0b37e3e4e9fb25cb4e9965d6ba45eb0d2b4 (diff) | |
parent | bc4268998d154b9b3cc86a7b6bd932cc974591c9 (diff) |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'audio')
-rw-r--r-- | audio/fmodaudio.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/audio/fmodaudio.c b/audio/fmodaudio.c index c34cf53567..fabf84dd3b 100644 --- a/audio/fmodaudio.c +++ b/audio/fmodaudio.c @@ -343,7 +343,7 @@ static void fmod_fini_out (HWVoiceOut *hw) static int fmod_init_out (HWVoiceOut *hw, struct audsettings *as) { - int bits16, mode, channel; + int mode, channel; FMODVoiceOut *fmd = (FMODVoiceOut *) hw; struct audsettings obt_as = *as; @@ -374,7 +374,6 @@ static int fmod_init_out (HWVoiceOut *hw, struct audsettings *as) /* FMOD always operates on little endian frames? */ obt_as.endianness = 0; audio_pcm_init_info (&hw->info, &obt_as); - bits16 = (mode & FSOUND_16BITS) != 0; hw->samples = conf.nb_samples; return 0; } @@ -405,7 +404,7 @@ static int fmod_ctl_out (HWVoiceOut *hw, int cmd, ...) static int fmod_init_in (HWVoiceIn *hw, struct audsettings *as) { - int bits16, mode; + int mode; FMODVoiceIn *fmd = (FMODVoiceIn *) hw; struct audsettings obt_as = *as; @@ -432,7 +431,6 @@ static int fmod_init_in (HWVoiceIn *hw, struct audsettings *as) /* FMOD always operates on little endian frames? */ obt_as.endianness = 0; audio_pcm_init_info (&hw->info, &obt_as); - bits16 = (mode & FSOUND_16BITS) != 0; hw->samples = conf.nb_samples; return 0; } |