diff options
| author | Volker Rümelin <vr_qemu@t-online.de> | 2021-01-10 11:02:17 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2021-01-15 11:25:22 +0100 |
| commit | ef26632e3a2b4c7b963ed17e5cc5731ca9e1c5ba (patch) | |
| tree | b00f6fcef6dd708c7eff975efc17e421bfe183ee | |
| parent | 45240eed4f064576d589ea60ebadf3c11d7ab891 (diff) | |
| download | focaccia-qemu-ef26632e3a2b4c7b963ed17e5cc5731ca9e1c5ba.tar.gz focaccia-qemu-ef26632e3a2b4c7b963ed17e5cc5731ca9e1c5ba.zip | |
sdlaudio: remove leftover SDL1.2 code
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>
| -rw-r--r-- | audio/sdlaudio.c | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c index 21b7a0484b..bf3cfb8456 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) |