[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/30] sdlaudio: remove leftover SDL1.2 code
From: |
Gerd Hoffmann |
Subject: |
[PULL 01/30] sdlaudio: remove leftover SDL1.2 code |
Date: |
Fri, 15 Jan 2021 14:21:17 +0100 |
From: Volker RĂ¼melin <vr_qemu@t-online.de>
Signed-off-by: Volker RĂ¼melin <vr_qemu@t-online.de>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-id: 9315afe5-5958-c0b4-ea1e-14769511a9d5@t-online.de
Message-Id: <20210110100239.27588-1-vr_qemu@t-online.de>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
audio/sdlaudio.c | 30 +++++++++++++-----------------
1 file changed, 13 insertions(+), 17 deletions(-)
diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c
index 21b7a0484bec..bf3cfb845616 100644
--- a/audio/sdlaudio.c
+++ b/audio/sdlaudio.c
@@ -240,28 +240,24 @@ static void sdl_callback (void *opaque, Uint8 *buf, int
len)
}
}
-#define SDL_WRAPPER_FUNC(name, ret_type, args_decl, args, fail, unlock) \
- static ret_type glue(sdl_, name)args_decl \
- { \
- ret_type ret; \
- \
- SDL_LockAudio(); \
- \
- ret = glue(audio_generic_, name)args; \
- \
- SDL_UnlockAudio(); \
- return ret; \
+#define SDL_WRAPPER_FUNC(name, ret_type, args_decl, args) \
+ static ret_type glue(sdl_, name)args_decl \
+ { \
+ ret_type ret; \
+ \
+ SDL_LockAudio(); \
+ ret = glue(audio_generic_, name)args; \
+ SDL_UnlockAudio(); \
+ \
+ return ret; \
}
SDL_WRAPPER_FUNC(get_buffer_out, void *, (HWVoiceOut *hw, size_t *size),
- (hw, size), *size = 0, sdl_unlock)
+ (hw, size))
SDL_WRAPPER_FUNC(put_buffer_out, size_t,
- (HWVoiceOut *hw, void *buf, size_t size), (hw, buf, size),
- /*nothing*/, sdl_unlock_and_post)
+ (HWVoiceOut *hw, void *buf, size_t size), (hw, buf, size))
SDL_WRAPPER_FUNC(write, size_t,
- (HWVoiceOut *hw, void *buf, size_t size), (hw, buf, size),
- /*nothing*/, sdl_unlock_and_post)
-
+ (HWVoiceOut *hw, void *buf, size_t size), (hw, buf, size))
#undef SDL_WRAPPER_FUNC
static void sdl_fini_out (HWVoiceOut *hw)
--
2.29.2
- [PULL 00/30] Audio 20210115 patches, Gerd Hoffmann, 2021/01/15
- [PULL 02/30] audio: fix bit-rotted code, Gerd Hoffmann, 2021/01/15
- [PULL 01/30] sdlaudio: remove leftover SDL1.2 code,
Gerd Hoffmann <=
- [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, 2021/01/15