system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-22 01:24:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

winealsa: Move release_capture_buffer to the unixlib.

Browse source 
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Huw Davies 2022-03-04 09:54:22 +00:00 committed by Alexandre Julliard
parent bb43ae25f9
commit bc70c4dabf
3 changed files with 42 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
dlls/winealsa.drv/alsa.c
View file

@ -1752,6 +1752,34 @@ static NTSTATUS get_capture_buffer(void *args)
return alsa_unlock_result(stream, &params->result, *frames ? S_OK : AUDCLNT_S_BUFFER_EMPTY);
}
static NTSTATUS release_capture_buffer(void *args)
{
struct release_capture_buffer_params *params = args;
struct alsa_stream *stream = params->stream;
UINT32 done = params->done;
alsa_lock(stream);
if(!done){
stream->getbuf_last = 0;
return alsa_unlock_result(stream, &params->result, S_OK);
}
if(!stream->getbuf_last)
return alsa_unlock_result(stream, &params->result, AUDCLNT_E_OUT_OF_ORDER);
if(stream->getbuf_last != done)
return alsa_unlock_result(stream, &params->result, AUDCLNT_E_INVALID_SIZE);
stream->written_frames += done;
stream->held_frames -= done;
stream->lcl_offs_frames += done;
stream->lcl_offs_frames %= stream->bufsize_frames;
stream->getbuf_last = 0;
return alsa_unlock_result(stream, &params->result, S_OK);
}
static NTSTATUS is_format_supported(void *args)
{
struct is_format_supported_params *params = args;
@ -2086,6 +2114,7 @@ unixlib_entry_t __wine_unix_call_funcs[] =
get_render_buffer,
release_render_buffer,
get_capture_buffer,
release_capture_buffer,
is_format_supported,
get_mix_format,
get_buffer_size,

31
dlls/winealsa.drv/mmdevdrv.c
View file

@ -1398,37 +1398,16 @@ static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer(
IAudioCaptureClient *iface, UINT32 done)
{
ACImpl *This = impl_from_IAudioCaptureClient(iface);
struct alsa_stream *stream = This->stream;
struct release_capture_buffer_params params;
TRACE("(%p)->(%u)\n", This, done);
alsa_lock(stream);
params.stream = This->stream;
params.done = done;
if(!done){
stream->getbuf_last = 0;
alsa_unlock(stream);
return S_OK;
}
ALSA_CALL(release_capture_buffer, &params);
if(!stream->getbuf_last){
alsa_unlock(stream);
return AUDCLNT_E_OUT_OF_ORDER;
}
if(stream->getbuf_last != done){
alsa_unlock(stream);
return AUDCLNT_E_INVALID_SIZE;
}
stream->written_frames += done;
stream->held_frames -= done;
stream->lcl_offs_frames += done;
stream->lcl_offs_frames %= stream->bufsize_frames;
stream->getbuf_last = 0;
alsa_unlock(stream);
return S_OK;
return params.result;
}
static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize(

8
dlls/winealsa.drv/unixlib.h
View file

@ -141,6 +141,13 @@ struct get_capture_buffer_params
UINT64 *qpcpos;
};
struct release_capture_buffer_params
{
struct alsa_stream *stream;
UINT32 done;
HRESULT result;
};
struct is_format_supported_params
{
const char *alsa_name;
@ -199,6 +206,7 @@ enum alsa_funcs
alsa_get_render_buffer,
alsa_release_render_buffer,
alsa_get_capture_buffer,
alsa_release_capture_buffer,
alsa_is_format_supported,
alsa_get_mix_format,
alsa_get_buffer_size,