Message ID | 84f1c61a-8399-c75e-96c2-febfc2dd5fab@t-online.de |
---|---|
Headers | show |
Series | Audio fixes and improvements | expand |
> diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c > index 21b7a0484b..cb931d0fda 100644 > --- a/audio/sdlaudio.c > +++ b/audio/sdlaudio.c > @@ -253,6 +253,7 @@ static void sdl_callback (void *opaque, Uint8 *buf, int len) > return ret; \ > } > > +SDL_WRAPPER_FUNC(buffer_get_free, size_t, (HWVoiceOut *hw), (hw)) > SDL_WRAPPER_FUNC(get_buffer_out, void *, (HWVoiceOut *hw, size_t *size), > (hw, size), *size = 0, sdl_unlock) > SDL_WRAPPER_FUNC(put_buffer_out, size_t, Compiling C object libcommon.fa.p/audio_sdlaudio.c.o ../../audio/sdlaudio.c:256:65: error: macro "SDL_WRAPPER_FUNC" requires 6 arguments, but only 4 given 256 | SDL_WRAPPER_FUNC(buffer_get_free, size_t, (HWVoiceOut *hw), (hw)) | ^ ../../audio/sdlaudio.c:243: note: macro "SDL_WRAPPER_FUNC" defined here 243 | #define SDL_WRAPPER_FUNC(name, ret_type, args_decl, args, fail, unlock) \ | ../../audio/sdlaudio.c:256:17: error: expected ‘;’ before ‘static’ 256 | SDL_WRAPPER_FUNC(buffer_get_free, size_t, (HWVoiceOut *hw), (hw)) | ^ | ; ../../audio/sdlaudio.c:355:24: error: ‘sdl_buffer_get_free’ undeclared here (not in a function) 355 | .buffer_get_free = sdl_buffer_get_free, | ^~~~~~~~~~~~~~~~~~~ make: *** [Makefile.ninja:1113: libcommon.fa.p/audio_sdlaudio.c.o] Error 1 (I think coreaudio has the same problem ...). take care, Gerd
On Sun, Sep 20, 2020 at 07:14:12PM +0200, Volker Rümelin wrote:
> A few fixes and improvements from my audio patch queue.
cherry-picked 1-7 into the audio queue.
thanks,
Gerd
>> diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c >> index 21b7a0484b..cb931d0fda 100644 >> --- a/audio/sdlaudio.c >> +++ b/audio/sdlaudio.c >> @@ -253,6 +253,7 @@ static void sdl_callback (void *opaque, Uint8 *buf, int len) >> return ret; \ >> } >> >> +SDL_WRAPPER_FUNC(buffer_get_free, size_t, (HWVoiceOut *hw), (hw)) >> SDL_WRAPPER_FUNC(get_buffer_out, void *, (HWVoiceOut *hw, size_t *size), >> (hw, size), *size = 0, sdl_unlock) >> SDL_WRAPPER_FUNC(put_buffer_out, size_t, > Compiling C object libcommon.fa.p/audio_sdlaudio.c.o > ../../audio/sdlaudio.c:256:65: error: macro "SDL_WRAPPER_FUNC" requires 6 arguments, but only 4 given > 256 | SDL_WRAPPER_FUNC(buffer_get_free, size_t, (HWVoiceOut *hw), (hw)) > | ^ > ../../audio/sdlaudio.c:243: note: macro "SDL_WRAPPER_FUNC" defined here > 243 | #define SDL_WRAPPER_FUNC(name, ret_type, args_decl, args, fail, unlock) \ > | > ../../audio/sdlaudio.c:256:17: error: expected ‘;’ before ‘static’ > 256 | SDL_WRAPPER_FUNC(buffer_get_free, size_t, (HWVoiceOut *hw), (hw)) > | ^ > | ; > ../../audio/sdlaudio.c:355:24: error: ‘sdl_buffer_get_free’ undeclared here (not in a function) > 355 | .buffer_get_free = sdl_buffer_get_free, > | ^~~~~~~~~~~~~~~~~~~ > make: *** [Makefile.ninja:1113: libcommon.fa.p/audio_sdlaudio.c.o] Error 1 > > (I think coreaudio has the same problem ...). > > take care, > Gerd > Sorry. This was caused by a bad rebase and my tests were insufficient. I guess I'll send my sdlaudio patches next. This patch has to wait. With best regards, Volker