diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-07-08 00:32:28 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2016-07-08 16:47:55 +0200 |
| commit | f40f360a2c4ca8e6f2a651dbcca3ae82e2abe7a1 (patch) | |
| tree | ef86e39ca4ee986c5ca2888dc96cdfa145a6c2ce /servers/audio | |
| parent | d8c31e0e7480906ccf230892b090e3c3cbe1b271 (diff) | |
Remove unused variables (fourth pass) + dead code
Also fix a potential regression from 3fcb9b1ec179b99d979d4cfea9b5e3c80e4a3e33.
Diffstat (limited to 'servers/audio')
| -rw-r--r-- | servers/audio/audio_mixer_sw.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/servers/audio/audio_mixer_sw.cpp b/servers/audio/audio_mixer_sw.cpp index 64369182b1..17f8c36c9a 100644 --- a/servers/audio/audio_mixer_sw.cpp +++ b/servers/audio/audio_mixer_sw.cpp @@ -75,7 +75,7 @@ void AudioMixerSW::do_resample(const Depth* p_src, int32_t *p_dst, ResamplerStat for(int i=0;i<(is_stereo?2:1);i++) { - int16_t nibble,signed_nibble,diff,step; + int16_t nibble,diff,step; p_state->ima_adpcm[i].last_nibble++; const uint8_t *src_ptr=p_state->ima_adpcm[i].ptr; @@ -92,10 +92,6 @@ void AudioMixerSW::do_resample(const Depth* p_src, int32_t *p_dst, ResamplerStat if (p_state->ima_adpcm[i].step_index>88) p_state->ima_adpcm[i].step_index=88; - /* - signed_nibble = (nibble&7) * ((nibble&8)?-1:1); - diff = (2 * signed_nibble + 1) * step / 4; */ - diff = step >> 3 ; if (nibble & 1) diff += step >> 2 ; |