ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winealsa: Move reset to the unixlib. 

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-02 10:53:19 +00:00 committed by Alexandre Julliard
parent 667241753e
commit f3bd61add4
3 changed files with 47 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
dlls/winealsa.drv/alsa.c
View File

@ -1514,6 +1514,41 @@ static NTSTATUS stop(void *args)
return alsa_unlock_result(stream, &params->result, S_OK); return alsa_unlock_result(stream, &params->result, S_OK);
} }
static NTSTATUS reset(void *args)
{
struct reset_params *params = args;
struct alsa_stream *stream = params->stream;
alsa_lock(stream);
if(stream->started)
return alsa_unlock_result(stream, &params->result, AUDCLNT_E_NOT_STOPPED);
if(stream->getbuf_last)
return alsa_unlock_result(stream, &params->result, AUDCLNT_E_BUFFER_OPERATION_PENDING);
if(snd_pcm_drop(stream->pcm_handle) < 0)
WARN("snd_pcm_drop failed\n");
if(snd_pcm_reset(stream->pcm_handle) < 0)
WARN("snd_pcm_reset failed\n");
if(snd_pcm_prepare(stream->pcm_handle) < 0)
WARN("snd_pcm_prepare failed\n");
if(stream->flow == eRender){
stream->written_frames = 0;
stream->last_pos_frames = 0;
}else{
stream->written_frames += stream->held_frames;
}
stream->held_frames = 0;
stream->lcl_offs_frames = 0;
stream->wri_offs_frames = 0;
return alsa_unlock_result(stream, &params->result, S_OK);
}
static NTSTATUS timer_loop(void *args) static NTSTATUS timer_loop(void *args)
{ {
struct timer_loop_params *params = args; struct timer_loop_params *params = args;
@ -1861,6 +1896,7 @@ unixlib_entry_t __wine_unix_call_funcs[] =
release_stream, release_stream,
start, start,
stop, stop,
reset,
timer_loop, timer_loop,
is_format_supported, is_format_supported,
get_mix_format, get_mix_format,

37
dlls/winealsa.drv/mmdevdrv.c
View File

@ -1020,47 +1020,18 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface)
static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface)
{ {
ACImpl *This = impl_from_IAudioClient3(iface); ACImpl *This = impl_from_IAudioClient3(iface);
struct alsa_stream *stream = This->stream; struct reset_params params;
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
if(!This->stream) if(!This->stream)
return AUDCLNT_E_NOT_INITIALIZED; return AUDCLNT_E_NOT_INITIALIZED;
alsa_lock(stream); params.stream = This->stream;
if(stream->started){ ALSA_CALL(reset, &params);
alsa_unlock(stream);
return AUDCLNT_E_NOT_STOPPED;
}
if(stream->getbuf_last){ return params.result;
alsa_unlock(stream);
return AUDCLNT_E_BUFFER_OPERATION_PENDING;
}
if(snd_pcm_drop(stream->pcm_handle) < 0)
WARN("snd_pcm_drop failed\n");
if(snd_pcm_reset(stream->pcm_handle) < 0)
WARN("snd_pcm_reset failed\n");
if(snd_pcm_prepare(stream->pcm_handle) < 0)
WARN("snd_pcm_prepare failed\n");
if(stream->flow == eRender){
stream->written_frames = 0;
stream->last_pos_frames = 0;
}else{
stream->written_frames += stream->held_frames;
}
stream->held_frames = 0;
stream->lcl_offs_frames = 0;
stream->wri_offs_frames = 0;
alsa_unlock(stream);
return S_OK;
} }
static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface,

7
dlls/winealsa.drv/unixlib.h
View File

@ -103,6 +103,12 @@ struct stop_params
HRESULT result; HRESULT result;
}; };
struct reset_params
{
struct alsa_stream *stream;
HRESULT result;
};
struct timer_loop_params struct timer_loop_params
{ {
struct alsa_stream *stream; struct alsa_stream *stream;
@ -154,6 +160,7 @@ enum alsa_funcs
alsa_release_stream, alsa_release_stream,
alsa_start, alsa_start,
alsa_stop, alsa_stop,
alsa_reset,
alsa_timer_loop, alsa_timer_loop,
alsa_is_format_supported, alsa_is_format_supported,
alsa_get_mix_format, alsa_get_mix_format,