audio/sdlaudio: Simplify the sdl_callback function
At the end of the while-loop, either "samples" or "sdl->live" is zero, so now that we've removed the semaphore code, the content of the while-loop is always only executed once. Thus we can remove the while-loop now to get rid of one indentation level here. Signed-off-by: Thomas Huth <thuth@redhat.com> Message-id: 1549336101-17623-3-git-send-email-thuth@redhat.com Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
8a7816c4ac
commit
9399ef1683
|
@ -189,37 +189,30 @@ static void sdl_callback (void *opaque, Uint8 *buf, int len)
|
||||||
SDLAudioState *s = &glob_sdl;
|
SDLAudioState *s = &glob_sdl;
|
||||||
HWVoiceOut *hw = &sdl->hw;
|
HWVoiceOut *hw = &sdl->hw;
|
||||||
int samples = len >> hw->info.shift;
|
int samples = len >> hw->info.shift;
|
||||||
|
int to_mix, decr;
|
||||||
|
|
||||||
if (s->exit) {
|
if (s->exit || !sdl->live) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
while (samples) {
|
/* dolog ("in callback samples=%d live=%d\n", samples, sdl->live); */
|
||||||
int to_mix, decr;
|
|
||||||
|
|
||||||
/* dolog ("in callback samples=%d\n", samples); */
|
to_mix = audio_MIN(samples, sdl->live);
|
||||||
|
decr = to_mix;
|
||||||
|
while (to_mix) {
|
||||||
|
int chunk = audio_MIN(to_mix, hw->samples - hw->rpos);
|
||||||
|
struct st_sample *src = hw->mix_buf + hw->rpos;
|
||||||
|
|
||||||
if (s->exit || !sdl->live) {
|
/* dolog ("in callback to_mix %d, chunk %d\n", to_mix, chunk); */
|
||||||
break;
|
hw->clip(buf, src, chunk);
|
||||||
}
|
hw->rpos = (hw->rpos + chunk) % hw->samples;
|
||||||
|
to_mix -= chunk;
|
||||||
/* dolog ("in callback live=%d\n", live); */
|
buf += chunk << hw->info.shift;
|
||||||
to_mix = audio_MIN (samples, sdl->live);
|
|
||||||
decr = to_mix;
|
|
||||||
while (to_mix) {
|
|
||||||
int chunk = audio_MIN (to_mix, hw->samples - hw->rpos);
|
|
||||||
struct st_sample *src = hw->mix_buf + hw->rpos;
|
|
||||||
|
|
||||||
/* dolog ("in callback to_mix %d, chunk %d\n", to_mix, chunk); */
|
|
||||||
hw->clip (buf, src, chunk);
|
|
||||||
hw->rpos = (hw->rpos + chunk) % hw->samples;
|
|
||||||
to_mix -= chunk;
|
|
||||||
buf += chunk << hw->info.shift;
|
|
||||||
}
|
|
||||||
samples -= decr;
|
|
||||||
sdl->live -= decr;
|
|
||||||
sdl->decr += decr;
|
|
||||||
}
|
}
|
||||||
|
samples -= decr;
|
||||||
|
sdl->live -= decr;
|
||||||
|
sdl->decr += decr;
|
||||||
|
|
||||||
/* dolog ("done len=%d\n", len); */
|
/* dolog ("done len=%d\n", len); */
|
||||||
|
|
||||||
/* SDL2 does not clear the remaining buffer for us, so do it on our own */
|
/* SDL2 does not clear the remaining buffer for us, so do it on our own */
|
||||||
|
|
Loading…
Reference in New Issue