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

winecoreaudio: Move get_position 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 2021-11-24 11:26:45 +00:00 committed by Alexandre Julliard
parent 5ff056f399
commit 46f5083e23
3 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/winecoreaudio.drv/coreaudio.c
View File

@ -1503,6 +1503,30 @@ static NTSTATUS get_next_packet_size(void *args)
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
static NTSTATUS get_position(void *args)
{
struct get_position_params *params = args;
struct coreaudio_stream *stream = params->stream;
LARGE_INTEGER stamp, freq;
OSSpinLockLock(&stream->lock);
*params->pos = stream->written_frames - stream->held_frames;
if(stream->share == AUDCLNT_SHAREMODE_SHARED)
*params->pos *= stream->fmt->nBlockAlign;
if(params->qpctime){
NtQueryPerformanceCounter(&stamp, &freq);
*params->qpctime = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart;
}
OSSpinLockUnlock(&stream->lock);
params->result = S_OK;
return STATUS_SUCCESS;
}
unixlib_entry_t __wine_unix_call_funcs[] = unixlib_entry_t __wine_unix_call_funcs[] =
{ {
get_endpoint_ids, get_endpoint_ids,
@ -1521,4 +1545,5 @@ 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_position,
}; };

32
dlls/winecoreaudio.drv/mmdevdrv.c
View File

@ -1469,42 +1469,22 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq)
return S_OK; return S_OK;
} }
static HRESULT AudioClock_GetPosition_nolock(ACImpl *This,
UINT64 *pos, UINT64 *qpctime)
{
*pos = This->stream->written_frames - This->stream->held_frames;
if(This->stream->share == AUDCLNT_SHAREMODE_SHARED)
*pos *= This->stream->fmt->nBlockAlign;
if(qpctime){
LARGE_INTEGER stamp, freq;
QueryPerformanceCounter(&stamp);
QueryPerformanceFrequency(&freq);
*qpctime = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart;
}
return S_OK;
}
static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos,
UINT64 *qpctime) UINT64 *qpctime)
{ {
ACImpl *This = impl_from_IAudioClock(iface); ACImpl *This = impl_from_IAudioClock(iface);
HRESULT hr; struct get_position_params params;
TRACE("(%p)->(%p, %p)\n", This, pos, qpctime); TRACE("(%p)->(%p, %p)\n", This, pos, qpctime);
if(!pos) if(!pos)
return E_POINTER; return E_POINTER;
OSSpinLockLock(&This->stream->lock); params.stream = This->stream;
params.pos = pos;
hr = AudioClock_GetPosition_nolock(This, pos, qpctime); params.qpctime = qpctime;
UNIX_CALL(get_position, &params);
OSSpinLockUnlock(&This->stream->lock); return params.result;
return hr;
} }
static HRESULT WINAPI AudioClock_GetCharacteristics(IAudioClock *iface, static HRESULT WINAPI AudioClock_GetCharacteristics(IAudioClock *iface,

9
dlls/winecoreaudio.drv/unixlib.h
View File

@ -173,6 +173,14 @@ struct get_next_packet_size_params
UINT32 *frames; UINT32 *frames;
}; };
struct get_position_params
{
struct coreaudio_stream *stream;
HRESULT result;
UINT64 *pos;
UINT64 *qpctime;
};
enum unix_funcs enum unix_funcs
{ {
unix_get_endpoint_ids, unix_get_endpoint_ids,
@ -191,6 +199,7 @@ enum unix_funcs
unix_get_latency, unix_get_latency,
unix_get_current_padding, unix_get_current_padding,
unix_get_next_packet_size, unix_get_next_packet_size,
unix_get_position,
}; };
extern unixlib_handle_t coreaudio_handle; extern unixlib_handle_t coreaudio_handle;