Huw Davies : winecoreaudio: Move get_frequency to the unixlib.
Alexandre Julliard
julliard at winehq.org
Wed Nov 24 15:17:18 CST 2021
Module: wine
Branch: master
Commit: b884ca314d64911c2ba6ea801a0196649adf43db
URL: https://source.winehq.org/git/wine.git/?a=commit;h=b884ca314d64911c2ba6ea801a0196649adf43db
Author: Huw Davies <huw at codeweavers.com>
Date: Wed Nov 24 11:26:46 2021 +0000
winecoreaudio: Move get_frequency to the unixlib.
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/winecoreaudio.drv/coreaudio.c | 15 +++++++++++++++
dlls/winecoreaudio.drv/mmdevdrv.c | 11 +++++------
dlls/winecoreaudio.drv/unixlib.h | 8 ++++++++
3 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c
index d7390c5a677..f59723d48f6 100644
--- a/dlls/winecoreaudio.drv/coreaudio.c
+++ b/dlls/winecoreaudio.drv/coreaudio.c
@@ -1527,6 +1527,20 @@ static NTSTATUS get_position(void *args)
return STATUS_SUCCESS;
}
+static NTSTATUS get_frequency(void *args)
+{
+ struct get_frequency_params *params = args;
+ struct coreaudio_stream *stream = params->stream;
+
+ if(stream->share == AUDCLNT_SHAREMODE_SHARED)
+ *params->freq = (UINT64)stream->fmt->nSamplesPerSec * stream->fmt->nBlockAlign;
+ else
+ *params->freq = stream->fmt->nSamplesPerSec;
+
+ params->result = S_OK;
+ return STATUS_SUCCESS;
+}
+
unixlib_entry_t __wine_unix_call_funcs[] =
{
get_endpoint_ids,
@@ -1546,4 +1560,5 @@ unixlib_entry_t __wine_unix_call_funcs[] =
get_current_padding,
get_next_packet_size,
get_position,
+ get_frequency,
};
diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c
index ebfc0543af8..f79d808d8ed 100644
--- a/dlls/winecoreaudio.drv/mmdevdrv.c
+++ b/dlls/winecoreaudio.drv/mmdevdrv.c
@@ -1458,15 +1458,14 @@ static ULONG WINAPI AudioClock_Release(IAudioClock *iface)
static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq)
{
ACImpl *This = impl_from_IAudioClock(iface);
+ struct get_frequency_params params;
TRACE("(%p)->(%p)\n", This, freq);
- if(This->stream->share == AUDCLNT_SHAREMODE_SHARED)
- *freq = (UINT64)This->stream->fmt->nSamplesPerSec * This->stream->fmt->nBlockAlign;
- else
- *freq = This->stream->fmt->nSamplesPerSec;
-
- return S_OK;
+ params.stream = This->stream;
+ params.freq = freq;
+ UNIX_CALL(get_frequency, ¶ms);
+ return params.result;
}
static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos,
diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h
index e9edaf82973..5dcefe2eb05 100644
--- a/dlls/winecoreaudio.drv/unixlib.h
+++ b/dlls/winecoreaudio.drv/unixlib.h
@@ -181,6 +181,13 @@ struct get_position_params
UINT64 *qpctime;
};
+struct get_frequency_params
+{
+ struct coreaudio_stream *stream;
+ HRESULT result;
+ UINT64 *freq;
+};
+
enum unix_funcs
{
unix_get_endpoint_ids,
@@ -200,6 +207,7 @@ enum unix_funcs
unix_get_current_padding,
unix_get_next_packet_size,
unix_get_position,
+ unix_get_frequency,
};
extern unixlib_handle_t coreaudio_handle;
More information about the wine-cvs
mailing list