[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/30] audio: remove remaining unused plive code
From: |
Gerd Hoffmann |
Subject: |
[PULL 12/30] audio: remove remaining unused plive code |
Date: |
Fri, 15 Jan 2021 14:21:28 +0100 |
From: Volker RĂ¼melin <vr_qemu@t-online.de>
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>
---
audio/audio.c | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/audio/audio.c b/audio/audio.c
index 22d769db0c99..34c9cb918279 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -1132,7 +1132,7 @@ static void audio_run_out (AudioState *s)
while ((hw = audio_pcm_hw_find_any_enabled_out(s, hw))) {
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);
if (!nb_live) {
@@ -1194,7 +1194,6 @@ static void audio_run_out (AudioState *s)
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) {
if (!sw->active && sw->empty) {
continue;
@@ -1210,7 +1209,6 @@ static void audio_run_out (AudioState *s)
if (!sw->total_hw_samples_mixed) {
sw->empty = 1;
- cleanup_required |= !sw->active && !sw->callback.fn;
}
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;
- }
- }
}
}
--
2.29.2
- [PULL 01/30] sdlaudio: remove leftover SDL1.2 code, (continued)
- [PULL 01/30] sdlaudio: remove leftover SDL1.2 code, Gerd Hoffmann, 2021/01/15
- [PULL 10/30] audio: break generic buffer dependency on mixing-engine, Gerd Hoffmann, 2021/01/15
- [PULL 20/30] dsoundaudio: replace GetForegroundWindow(), Gerd Hoffmann, 2021/01/15
- [PULL 11/30] sdlaudio: enable (in|out).mixing-engine=off, Gerd Hoffmann, 2021/01/15
- [PULL 08/30] audio: split pcm_ops function get_buffer_in, Gerd Hoffmann, 2021/01/15
- [PULL 18/30] paaudio: limit minreq to 75% of audio timer_rate, Gerd Hoffmann, 2021/01/15
- [PULL 03/30] sdlaudio: add -audiodev sdl,out.buffer-count option, Gerd Hoffmann, 2021/01/15
- [PULL 22/30] dsoundaudio: enable f32 audio sample format, Gerd Hoffmann, 2021/01/15
- [PULL 05/30] sdlaudio: always clear the sample buffer, Gerd Hoffmann, 2021/01/15
- [PULL 04/30] sdlaudio: don't start playback in init routine, Gerd Hoffmann, 2021/01/15
- [PULL 12/30] audio: remove remaining unused plive code,
Gerd Hoffmann <=
- [PULL 15/30] paaudio: wait until the playback stream is ready, Gerd Hoffmann, 2021/01/15
- [PULL 21/30] dsoundaudio: rename dsound_open(), Gerd Hoffmann, 2021/01/15
- [PULL 09/30] sdlaudio: add recording functions, Gerd Hoffmann, 2021/01/15
- [PULL 07/30] sdlaudio: replace legacy functions with modern ones, Gerd Hoffmann, 2021/01/15
- [PULL 27/30] audio: Fix lines over 90 characters, Gerd Hoffmann, 2021/01/15
- [PULL 06/30] sdlaudio: fill remaining sample buffer with silence, Gerd Hoffmann, 2021/01/15
- [PULL 28/30] audio: Don't use '%#' in format strings, Gerd Hoffmann, 2021/01/15
- [PULL 23/30] dsoundaudio: fix log message, Gerd Hoffmann, 2021/01/15
- [PULL 24/30] audio: Add braces for statements/fix braces' position, Gerd Hoffmann, 2021/01/15
- [PULL 13/30] paaudio: avoid to clip samples multiple times, Gerd Hoffmann, 2021/01/15