mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

audio: remove remaining unused plive code

Browse Source 
Commit 73ad33ef7b "audio: remove plive" forgot to remove this code.

Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Message-id: 9315afe5-5958-c0b4-ea1e-14769511a9d5@t-online.de
Message-Id: <20210110100239.27588-12-vr_qemu@t-online.de>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Volker Rümelin 2021-01-10 11:02:28 +01:00 committed by Gerd Hoffmann
parent bd37ede4eb
commit 6fb0cd5054
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
audio/audio.c
View File

@ -1132,7 +1132,7 @@ static void audio_run_out (AudioState *s)
while ((hw = audio_pcm_hw_find_any_enabled_out(s, hw))) { while ((hw = audio_pcm_hw_find_any_enabled_out(s, hw))) {
size_t played, live, prev_rpos, free; size_t played, live, prev_rpos, free;
int nb_live, cleanup_required; int nb_live;
live = audio_pcm_hw_get_live_out (hw, &nb_live); live = audio_pcm_hw_get_live_out (hw, &nb_live);
if (!nb_live) { if (!nb_live) {
@ -1194,7 +1194,6 @@ static void audio_run_out (AudioState *s)
audio_capture_mix_and_clear (hw, prev_rpos, played); audio_capture_mix_and_clear (hw, prev_rpos, played);
} }
cleanup_required = 0;
for (sw = hw->sw_head.lh_first; sw; sw = sw->entries.le_next) { for (sw = hw->sw_head.lh_first; sw; sw = sw->entries.le_next) {
if (!sw->active && sw->empty) { if (!sw->active && sw->empty) {
continue; continue;
@ -1210,7 +1209,6 @@ static void audio_run_out (AudioState *s)
if (!sw->total_hw_samples_mixed) { if (!sw->total_hw_samples_mixed) {
sw->empty = 1; sw->empty = 1;
cleanup_required |= !sw->active && !sw->callback.fn;
} }
if (sw->active) { if (sw->active) {
@ -1220,19 +1218,6 @@ static void audio_run_out (AudioState *s)
} }
} }
} }
if (cleanup_required) {
SWVoiceOut *sw1;
sw = hw->sw_head.lh_first;
while (sw) {
sw1 = sw->entries.le_next;
if (!sw->active && !sw->callback.fn) {
audio_close_out (sw);
}
sw = sw1;
}
}
} }
} }