mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-06 17:14:06 +00:00
wineoss: Move stop 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:
parent
cc8e8bc692
commit
dca18a115b
|
@ -961,26 +961,17 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface)
|
|||
static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface)
|
||||
{
|
||||
ACImpl *This = impl_from_IAudioClient3(iface);
|
||||
struct oss_stream *stream = This->stream;
|
||||
struct stop_params params;
|
||||
|
||||
TRACE("(%p)\n", This);
|
||||
|
||||
if(!This->stream)
|
||||
return AUDCLNT_E_NOT_INITIALIZED;
|
||||
|
||||
oss_lock(stream);
|
||||
params.stream = This->stream;
|
||||
OSS_CALL(stop, ¶ms);
|
||||
|
||||
if(!stream->playing){
|
||||
oss_unlock(stream);
|
||||
return S_FALSE;
|
||||
}
|
||||
|
||||
stream->playing = FALSE;
|
||||
stream->in_oss_frames = 0;
|
||||
|
||||
oss_unlock(stream);
|
||||
|
||||
return S_OK;
|
||||
return params.result;
|
||||
}
|
||||
|
||||
static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface)
|
||||
|
|
|
@ -645,6 +645,22 @@ static NTSTATUS start(void *args)
|
|||
return oss_unlock_result(stream, ¶ms->result, S_OK);
|
||||
}
|
||||
|
||||
static NTSTATUS stop(void *args)
|
||||
{
|
||||
struct stop_params *params = args;
|
||||
struct oss_stream *stream = params->stream;
|
||||
|
||||
oss_lock(stream);
|
||||
|
||||
if(!stream->playing)
|
||||
return oss_unlock_result(stream, ¶ms->result, S_FALSE);
|
||||
|
||||
stream->playing = FALSE;
|
||||
stream->in_oss_frames = 0;
|
||||
|
||||
return oss_unlock_result(stream, ¶ms->result, S_OK);
|
||||
}
|
||||
|
||||
static void silence_buffer(struct oss_stream *stream, BYTE *buffer, UINT32 frames)
|
||||
{
|
||||
WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)stream->fmt;
|
||||
|
@ -1008,6 +1024,7 @@ unixlib_entry_t __wine_unix_call_funcs[] =
|
|||
create_stream,
|
||||
release_stream,
|
||||
start,
|
||||
stop,
|
||||
timer_loop,
|
||||
is_format_supported,
|
||||
get_mix_format,
|
||||
|
|
|
@ -96,6 +96,12 @@ struct start_params
|
|||
HRESULT result;
|
||||
};
|
||||
|
||||
struct stop_params
|
||||
{
|
||||
struct oss_stream *stream;
|
||||
HRESULT result;
|
||||
};
|
||||
|
||||
struct timer_loop_params
|
||||
{
|
||||
struct oss_stream *stream;
|
||||
|
@ -147,6 +153,7 @@ enum oss_funcs
|
|||
oss_create_stream,
|
||||
oss_release_stream,
|
||||
oss_start,
|
||||
oss_stop,
|
||||
oss_timer_loop,
|
||||
oss_is_format_supported,
|
||||
oss_get_mix_format,
|
||||
|
|
Loading…
Reference in a new issue