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

wineoss: Move get_frequency to the unixlib. 

Technically the lock doesn't need to be taken here since
the data is static, however doing so keeps the implementation
consistent with the others.

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-04-15 21:40:40 +01:00 committed by Alexandre Julliard
parent d1ab294002
commit 4e32993717
3 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/wineoss.drv/mmdevdrv.c
View File

@ -1427,16 +1427,15 @@ static ULONG WINAPI AudioClock_Release(IAudioClock *iface)
static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq)
{ {
ACImpl *This = impl_from_IAudioClock(iface); ACImpl *This = impl_from_IAudioClock(iface);
struct oss_stream *stream = This->stream; struct get_frequency_params params;
TRACE("(%p)->(%p)\n", This, freq); TRACE("(%p)->(%p)\n", This, freq);
if(stream->share == AUDCLNT_SHAREMODE_SHARED) params.stream = This->stream;
*freq = (UINT64)stream->fmt->nSamplesPerSec * stream->fmt->nBlockAlign; params.frequency = freq;
else OSS_CALL(get_frequency, &params);
*freq = stream->fmt->nSamplesPerSec;
return S_OK; return params.result;
} }
static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos,

17
dlls/wineoss.drv/oss.c
View File

@ -1256,6 +1256,22 @@ static NTSTATUS get_next_packet_size(void *args)
return oss_unlock_result(stream, &params->result, S_OK); return oss_unlock_result(stream, &params->result, S_OK);
} }
static NTSTATUS get_frequency(void *args)
{
struct get_frequency_params *params = args;
struct oss_stream *stream = params->stream;
UINT64 *freq = params->frequency;
oss_lock(stream);
if(stream->share == AUDCLNT_SHAREMODE_SHARED)
*freq = (UINT64)stream->fmt->nSamplesPerSec * stream->fmt->nBlockAlign;
else
*freq = stream->fmt->nSamplesPerSec;
return oss_unlock_result(stream, &params->result, S_OK);
}
static NTSTATUS set_event_handle(void *args) static NTSTATUS set_event_handle(void *args)
{ {
struct set_event_handle_params *params = args; struct set_event_handle_params *params = args;
@ -1296,5 +1312,6 @@ unixlib_entry_t __wine_unix_call_funcs[] =
get_latency, get_latency,
get_current_padding, get_current_padding,
get_next_packet_size, get_next_packet_size,
get_frequency,
set_event_handle, set_event_handle,
}; };

8
dlls/wineoss.drv/unixlib.h
View File

@ -193,6 +193,13 @@ struct get_next_packet_size_params
UINT32 *frames; UINT32 *frames;
}; };
struct get_frequency_params
{
struct oss_stream *stream;
HRESULT result;
UINT64 *frequency;
};
struct set_event_handle_params struct set_event_handle_params
{ {
struct oss_stream *stream; struct oss_stream *stream;
@ -220,6 +227,7 @@ enum oss_funcs
oss_get_latency, oss_get_latency,
oss_get_current_padding, oss_get_current_padding,
oss_get_next_packet_size, oss_get_next_packet_size,
oss_get_frequency,
oss_set_event_handle, oss_set_event_handle,
}; };