mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-21 18:40:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup wasapi.c

Browse Source
This commit is contained in:
twinaphex 2017-09-28 21:45:11 +02:00
parent d9593c7cae
commit be333837e9
1 changed files with 102 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

326
audio/drivers/wasapi.c
View File

@ -38,6 +38,51 @@
DEFINE_PROPERTYKEY(PKEY_Device_FriendlyName, 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 14); /* DEVPROP_TYPE_STRING */ DEFINE_PROPERTYKEY(PKEY_Device_FriendlyName, 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 14); /* DEVPROP_TYPE_STRING */
#ifdef __cplusplus
#define _IMMDeviceCollection_Item(This,nDevice,ppdevice) (This)->Item(nDevice,ppdevice)
#define _IAudioClient_Start(This) ( (This)->Start() )
#define _IAudioClient_Stop(This) ( (This)->Stop() )
#define _IAudioClient_GetCurrentPadding(This,pNumPaddingFrames) \
( (This)->GetCurrentPadding(pNumPaddingFrames) )
#define _IAudioRenderClient_GetBuffer(This,NumFramesRequested,ppData) \
( (This)->GetBuffer(NumFramesRequested,ppData) )
#define _IAudioRenderClient_ReleaseBuffer(This,NumFramesWritten,dwFlags) \
( (This)->ReleaseBuffer(NumFramesWritten,dwFlags) )
#define _IAudioClient_GetService(This,riid,ppv) ( (This)->GetService(riid,ppv) )
#define _IAudioClient_SetEventHandle(This,eventHandle) ( (This)->SetEventHandle(eventHandle) )
#define _IAudioClient_GetBufferSize(This,pNumBufferFrames) ( (This)->GetBufferSize(pNumBufferFrames) )
#define _IAudioClient_GetStreamLatency(This,phnsLatency) ( (This)->GetStreamLatency(phnsLatency) )
#define _IAudioClient_GetDevicePeriod(This,phnsDefaultDevicePeriod,phnsMinimumDevicePeriod) ( (This)->GetDevicePeriod(phnsDefaultDevicePeriod,phnsMinimumDevicePeriod) )
#define _IMMDevice_Activate(This,iid,dwClsCtx,pActivationParams,ppv) ((This)->Activate(iid,(dwClsCtx),pActivationParams,ppv))
#define _IMMDeviceEnumerator_EnumAudioEndpoints(This,dataFlow,dwStateMask,ppDevices) (This)->EnumAudioEndpoints(dataFlow,dwStateMask,ppDevices)
#define _IMMDeviceEnumerator_GetDefaultAudioEndpoint(This,dataFlow,role,ppEndpoint) (This)->GetDefaultAudioEndpoint(dataFlow,role,ppEndpoint)
#define _IMMDevice_OpenPropertyStore(This,stgmAccess,ppProperties) (This)->OpenPropertyStore(stgmAccess,ppProperties)
#define _IMMDevice_GetId(This,ppstrId) ((This)->GetId(ppstrId))
#define _IPropertyStore_GetValue(This,key,pv) ( (This)->GetValue(key,pv) )
#define _IMMDeviceCollection_GetCount(This,cProps) ( (This)->GetCount(cProps) )
#else
#define _IMMDeviceCollection_Item(This,nDevice,ppdevice) (This)->lpVtbl->Item(This,nDevice,ppdevice)
#define _IAudioClient_Start(This) ( (This)->lpVtbl -> Start(This) )
#define _IAudioClient_Stop(This) ( (This)->lpVtbl -> Stop(This) )
#define _IAudioClient_GetCurrentPadding(This,pNumPaddingFrames) \
( (This)->lpVtbl -> GetCurrentPadding(This,pNumPaddingFrames) )
#define _IAudioRenderClient_GetBuffer(This,NumFramesRequested,ppData) \
( (This)->lpVtbl -> GetBuffer(This,NumFramesRequested,ppData) )
#define _IAudioRenderClient_ReleaseBuffer(This,NumFramesWritten,dwFlags) \
( (This)->lpVtbl -> ReleaseBuffer(This,NumFramesWritten,dwFlags) )
#define _IAudioClient_GetService(This,riid,ppv) ( (This)->lpVtbl -> GetService(This,&(riid),ppv) )
#define _IAudioClient_SetEventHandle(This,eventHandle) ( (This)->lpVtbl -> SetEventHandle(This,eventHandle) )
#define _IAudioClient_GetBufferSize(This,pNumBufferFrames) ( (This)->lpVtbl -> GetBufferSize(This,pNumBufferFrames) )
#define _IAudioClient_GetStreamLatency(This,phnsLatency) ( (This)->lpVtbl -> GetStreamLatency(This,phnsLatency) )
#define _IAudioClient_GetDevicePeriod(This,phnsDefaultDevicePeriod,phnsMinimumDevicePeriod) ( (This)->lpVtbl -> GetDevicePeriod(This,phnsDefaultDevicePeriod,phnsMinimumDevicePeriod) )
#define _IMMDevice_Activate(This,iid,dwClsCtx,pActivationParams,ppv) ((This)->lpVtbl->Activate(This,&(iid),dwClsCtx,pActivationParams,ppv))
#define _IMMDeviceEnumerator_EnumAudioEndpoints(This,dataFlow,dwStateMask,ppDevices) (This)->lpVtbl->EnumAudioEndpoints(This,dataFlow,dwStateMask,ppDevices)
#define _IMMDeviceEnumerator_GetDefaultAudioEndpoint(This,dataFlow,role,ppEndpoint) (This)->lpVtbl->GetDefaultAudioEndpoint(This,dataFlow,role,ppEndpoint)
#define _IMMDevice_OpenPropertyStore(This,stgmAccess,ppProperties) (This)->lpVtbl->OpenPropertyStore(This,stgmAccess,ppProperties)
#define _IMMDevice_GetId(This,ppstrId) (This)->lpVtbl->GetId(This,ppstrId)
#define _IPropertyStore_GetValue(This,key,pv) ( (This)->lpVtbl -> GetValue(This,&(key),pv) )
#define _IMMDeviceCollection_GetCount(This,cProps) ( (This)->lpVtbl -> GetCount(This,cProps) )
#endif
#define WASAPI_WARN(bool_exp, err_str, warn_exp) \ #define WASAPI_WARN(bool_exp, err_str, warn_exp) \
if (!(bool_exp)) { \ if (!(bool_exp)) { \
@ -119,11 +164,7 @@ static bool wasapi_check_device_id(IMMDevice *device, const char *id)
id_length = MultiByteToWideChar(CP_ACP, 0, id, -1, dev_cmp_id, id_length); id_length = MultiByteToWideChar(CP_ACP, 0, id, -1, dev_cmp_id, id_length);
WASAPI_SR_CHECK(id_length > 0, "MultiByteToWideChar", goto error); WASAPI_SR_CHECK(id_length > 0, "MultiByteToWideChar", goto error);
#ifdef __cplusplus hr = _IMMDevice_GetId(device, &dev_id);
hr = device->GetId(&dev_id);
#else
hr = device->lpVtbl->GetId(device, &dev_id);
#endif
WASAPI_HR_CHECK(hr, "IMMDevice::GetId", goto error); WASAPI_HR_CHECK(hr, "IMMDevice::GetId", goto error);
result = lstrcmpW(dev_cmp_id, dev_id) == 0 ? true : false; result = lstrcmpW(dev_cmp_id, dev_id) == 0 ? true : false;
@ -168,30 +209,17 @@ static IMMDevice *wasapi_init_device(const char *id)
if (id) if (id)
{ {
#ifdef __cplusplus hr = _IMMDeviceEnumerator_EnumAudioEndpoints(enumerator,
hr = enumerator->EnumAudioEndpoints( eRender, DEVICE_STATE_ACTIVE, &collection);
eRender, DEVICE_STATE_ACTIVE, &collection);
#else
hr = enumerator->lpVtbl->EnumAudioEndpoints(enumerator,
eRender, DEVICE_STATE_ACTIVE, &collection);
#endif
WASAPI_HR_CHECK(hr, "IMMDeviceEnumerator::EnumAudioEndpoints", WASAPI_HR_CHECK(hr, "IMMDeviceEnumerator::EnumAudioEndpoints",
goto error); goto error);
#ifdef __cplusplus hr = _IMMDeviceCollection_GetCount(collection, &dev_count);
hr = collection->GetCount(&dev_count);
#else
hr = collection->lpVtbl->GetCount(collection, &dev_count);
#endif
WASAPI_HR_CHECK(hr, "IMMDeviceCollection::GetCount", goto error); WASAPI_HR_CHECK(hr, "IMMDeviceCollection::GetCount", goto error);
for (i = 0; i < dev_count; ++i) for (i = 0; i < dev_count; ++i)
{ {
#ifdef __cplusplus hr = _IMMDeviceCollection_Item(collection, i, &device);
hr = collection->Item(i, &device);
#else
hr = collection->lpVtbl->Item(collection, i, &device);
#endif
WASAPI_HR_CHECK(hr, "IMMDeviceCollection::Item", continue); WASAPI_HR_CHECK(hr, "IMMDeviceCollection::Item", continue);
if (wasapi_check_device_id(device, id)) if (wasapi_check_device_id(device, id))
@ -202,13 +230,8 @@ static IMMDevice *wasapi_init_device(const char *id)
} }
else else
{ {
#ifdef __cplusplus hr = _IMMDeviceEnumerator_GetDefaultAudioEndpoint(
hr = enumerator->GetDefaultAudioEndpoint( enumerator, eRender, eConsole, &device);
eRender, eConsole, &device);
#else
hr = enumerator->lpVtbl->GetDefaultAudioEndpoint(enumerator,
eRender, eConsole, &device);
#endif
WASAPI_HR_CHECK(hr, "IMMDeviceEnumerator::GetDefaultAudioEndpoint", WASAPI_HR_CHECK(hr, "IMMDeviceEnumerator::GetDefaultAudioEndpoint",
goto error); goto error);
} }
@ -282,13 +305,9 @@ static IAudioClient *wasapi_init_client_sh(IMMDevice *device,
IAudioClient *client = NULL; IAudioClient *client = NULL;
bool float_fmt_res = *float_fmt; bool float_fmt_res = *float_fmt;
unsigned rate_res = *rate; unsigned rate_res = *rate;
#ifdef __cplusplus HRESULT hr = _IMMDevice_Activate(device,
HRESULT hr = device->Activate(IID_IAudioClient, IID_IAudioClient,
CLSCTX_ALL, NULL, (void**)&client); CLSCTX_ALL, NULL, (void**)&client);
#else
HRESULT hr = device->lpVtbl->Activate(device, &IID_IAudioClient,
CLSCTX_ALL, NULL, (void**)&client);
#endif
WASAPI_HR_CHECK(hr, "IMMDevice::Activate", return NULL); WASAPI_HR_CHECK(hr, "IMMDevice::Activate", return NULL);
/* once for float, once for pcm (requested first) */ /* once for float, once for pcm (requested first) */
@ -318,13 +337,9 @@ static IAudioClient *wasapi_init_client_sh(IMMDevice *device,
if (hr == AUDCLNT_E_ALREADY_INITIALIZED) if (hr == AUDCLNT_E_ALREADY_INITIALIZED)
{ {
WASAPI_RELEASE(client); WASAPI_RELEASE(client);
#ifdef __cplusplus HRESULT hr = _IMMDevice_Activate(device,
hr = device->Activate(IID_IAudioClient, IID_IAudioClient,
CLSCTX_ALL, NULL, (void**)&client); CLSCTX_ALL, NULL, (void**)&client);
#else
hr = device->lpVtbl->Activate(device, &IID_IAudioClient,
CLSCTX_ALL, NULL, (void**)&client);
#endif
WASAPI_HR_CHECK(hr, "IMMDevice::Activate", return NULL); WASAPI_HR_CHECK(hr, "IMMDevice::Activate", return NULL);
#ifdef __cplusplus #ifdef __cplusplus
@ -374,22 +389,12 @@ static IAudioClient *wasapi_init_client_ex(IMMDevice *device,
REFERENCE_TIME minimum_period = 0; REFERENCE_TIME minimum_period = 0;
REFERENCE_TIME buffer_duration = 0; REFERENCE_TIME buffer_duration = 0;
UINT32 buffer_length = 0; UINT32 buffer_length = 0;
#ifdef __cplusplus HRESULT hr = _IMMDevice_Activate(device,
HRESULT hr = device->Activate( IID_IAudioClient,
IID_IAudioClient,
CLSCTX_ALL, NULL, (void**)&client); CLSCTX_ALL, NULL, (void**)&client);
#else
HRESULT hr = device->lpVtbl->Activate(
device, &IID_IAudioClient,
CLSCTX_ALL, NULL, (void**)&client);
#endif
WASAPI_HR_CHECK(hr, "IMMDevice::Activate", return NULL); WASAPI_HR_CHECK(hr, "IMMDevice::Activate", return NULL);
#ifdef __cplusplus hr = _IAudioClient_GetDevicePeriod(client, NULL, &minimum_period);
hr = client->GetDevicePeriod(NULL, &minimum_period);
#else
hr = client->lpVtbl->GetDevicePeriod(client, NULL, &minimum_period);
#endif
WASAPI_HR_CHECK(hr, "IAudioClient::GetDevicePeriod", goto error); WASAPI_HR_CHECK(hr, "IAudioClient::GetDevicePeriod", goto error);
/* buffer_duration is in 100ns units */ /* buffer_duration is in 100ns units */
@ -422,21 +427,13 @@ static IAudioClient *wasapi_init_client_ex(IMMDevice *device,
#endif #endif
if (hr == AUDCLNT_E_BUFFER_SIZE_NOT_ALIGNED) if (hr == AUDCLNT_E_BUFFER_SIZE_NOT_ALIGNED)
{ {
#ifdef __cplusplus hr = _IAudioClient_GetBufferSize(client, &buffer_length);
hr = client->GetBufferSize(&buffer_length);
#else
hr = client->lpVtbl->GetBufferSize(client, &buffer_length);
#endif
WASAPI_HR_CHECK(hr, "IAudioClient::GetBufferSize", goto error); WASAPI_HR_CHECK(hr, "IAudioClient::GetBufferSize", goto error);
WASAPI_RELEASE(client); WASAPI_RELEASE(client);
#ifdef __cplusplus hr = _IMMDevice_Activate(device,
hr = device->Activate(IID_IAudioClient, IID_IAudioClient,
CLSCTX_ALL, NULL, (void**)&client); CLSCTX_ALL, NULL, (void**)&client);
#else
hr = device->lpVtbl->Activate(device, &IID_IAudioClient,
CLSCTX_ALL, NULL, (void**)&client);
#endif
WASAPI_HR_CHECK(hr, "IMMDevice::Activate", return NULL); WASAPI_HR_CHECK(hr, "IMMDevice::Activate", return NULL);
buffer_duration = 10000.0 * 1000.0 / rate_res * buffer_length + 0.5; buffer_duration = 10000.0 * 1000.0 / rate_res * buffer_length + 0.5;
@ -453,13 +450,9 @@ static IAudioClient *wasapi_init_client_ex(IMMDevice *device,
if (hr == AUDCLNT_E_ALREADY_INITIALIZED) if (hr == AUDCLNT_E_ALREADY_INITIALIZED)
{ {
WASAPI_RELEASE(client); WASAPI_RELEASE(client);
#ifdef __cplusplus hr = _IMMDevice_Activate(device,
hr = device->Activate(IID_IAudioClient, IID_IAudioClient,
CLSCTX_ALL, NULL, (void**)&client); CLSCTX_ALL, NULL, (void**)&client);
#else
hr = device->lpVtbl->Activate(device, &IID_IAudioClient,
CLSCTX_ALL, NULL, (void**)&client);
#endif
WASAPI_HR_CHECK(hr, "IMMDevice::Activate", return NULL); WASAPI_HR_CHECK(hr, "IMMDevice::Activate", return NULL);
#ifdef __cplusplus #ifdef __cplusplus
@ -540,21 +533,9 @@ static IAudioClient *wasapi_init_client(IMMDevice *device, bool *exclusive,
/* next calls are allowed to fail (we losing info only) */ /* next calls are allowed to fail (we losing info only) */
if (*exclusive) if (*exclusive)
{ hr = _IAudioClient_GetDevicePeriod(client, NULL, &device_period);
#ifdef __cplusplus
hr = client->GetDevicePeriod(NULL, &device_period);
#else
hr = client->lpVtbl->GetDevicePeriod(client, NULL, &device_period);
#endif
}
else else
{ hr = _IAudioClient_GetDevicePeriod(client, &device_period, NULL);
#ifdef __cplusplus
hr = client->GetDevicePeriod(&device_period, NULL);
#else
hr = client->lpVtbl->GetDevicePeriod(client, &device_period, NULL);
#endif
}
if (FAILED(hr)) if (FAILED(hr))
{ {
@ -563,22 +544,14 @@ static IAudioClient *wasapi_init_client(IMMDevice *device, bool *exclusive,
if (!*exclusive) if (!*exclusive)
{ {
#ifdef __cplusplus hr = _IAudioClient_GetStreamLatency(client, &stream_latency);
hr = client->GetStreamLatency(&stream_latency);
#else
hr = client->lpVtbl->GetStreamLatency(client, &stream_latency);
#endif
if (FAILED(hr)) if (FAILED(hr))
{ {
RARCH_WARN("[WASAPI]: IAudioClient::GetStreamLatency failed with error 0x%.8X.\n", hr); RARCH_WARN("[WASAPI]: IAudioClient::GetStreamLatency failed with error 0x%.8X.\n", hr);
} }
} }
#ifdef __cplusplus hr = _IAudioClient_GetBufferSize(client, &buffer_length);
hr = client->GetBufferSize(&buffer_length);
#else
hr = client->lpVtbl->GetBufferSize(client, &buffer_length);
#endif
if (FAILED(hr)) if (FAILED(hr))
{ {
RARCH_WARN("[WASAPI]: IAudioClient::GetBufferSize failed with error 0x%.8X.\n", hr); RARCH_WARN("[WASAPI]: IAudioClient::GetBufferSize failed with error 0x%.8X.\n", hr);
@ -634,11 +607,7 @@ static void *wasapi_init(const char *dev_id, unsigned rate, unsigned latency,
if (!w->client) if (!w->client)
goto error; goto error;
#ifdef __cplusplus hr = _IAudioClient_GetBufferSize(w->client, &frame_count);
hr = w->client->GetBufferSize(&frame_count);
#else
hr = w->client->lpVtbl->GetBufferSize(w->client, &frame_count);
#endif
WASAPI_HR_CHECK(hr, "IAudioClient::GetBufferSize", goto error); WASAPI_HR_CHECK(hr, "IAudioClient::GetBufferSize", goto error);
w->frame_size = float_format ? 8 : 4; w->frame_size = float_format ? 8 : 4;
@ -655,11 +624,7 @@ static void *wasapi_init(const char *dev_id, unsigned rate, unsigned latency,
{ {
if (sh_buffer_length < 0) if (sh_buffer_length < 0)
{ {
#ifdef __cplusplus hr = _IAudioClient_GetDevicePeriod(w->client, &dev_period, NULL);
hr = w->client->GetDevicePeriod(&dev_period, NULL);
#else
hr = w->client->lpVtbl->GetDevicePeriod(w->client, &dev_period, NULL);
#endif
WASAPI_HR_CHECK(hr, "IAudioClient::GetDevicePeriod", goto error); WASAPI_HR_CHECK(hr, "IAudioClient::GetDevicePeriod", goto error);
sh_buffer_length = dev_period * rate / 10000000; sh_buffer_length = dev_period * rate / 10000000;
@ -679,43 +644,22 @@ static void *wasapi_init(const char *dev_id, unsigned rate, unsigned latency,
w->write_event = CreateEventA(NULL, FALSE, FALSE, NULL); w->write_event = CreateEventA(NULL, FALSE, FALSE, NULL);
WASAPI_SR_CHECK(w->write_event, "CreateEventA", goto error); WASAPI_SR_CHECK(w->write_event, "CreateEventA", goto error);
#ifdef __cplusplus hr = _IAudioClient_SetEventHandle(w->client, w->write_event);
hr = w->client->SetEventHandle(w->write_event);
#else
hr = w->client->lpVtbl->SetEventHandle(w->client, w->write_event);
#endif
WASAPI_HR_CHECK(hr, "IAudioClient::SetEventHandle", goto error); WASAPI_HR_CHECK(hr, "IAudioClient::SetEventHandle", goto error);
#ifdef __cplusplus hr = _IAudioClient_GetService(w->client,
hr = w->client->GetService(
IID_IAudioRenderClient, (void**)&w->renderer); IID_IAudioRenderClient, (void**)&w->renderer);
#else
hr = w->client->lpVtbl->GetService(w->client,
&IID_IAudioRenderClient, (void**)&w->renderer);
#endif
WASAPI_HR_CHECK(hr, "IAudioClient::GetService", goto error); WASAPI_HR_CHECK(hr, "IAudioClient::GetService", goto error);
#ifdef __cplusplus hr = _IAudioRenderClient_GetBuffer(w->renderer, frame_count, &dest);
hr = w->renderer->GetBuffer(frame_count, &dest);
#else
hr = w->renderer->lpVtbl->GetBuffer(w->renderer, frame_count, &dest);
#endif
WASAPI_HR_CHECK(hr, "IAudioRenderClient::GetBuffer", goto error); WASAPI_HR_CHECK(hr, "IAudioRenderClient::GetBuffer", goto error);
#ifdef __cplusplus hr = _IAudioRenderClient_ReleaseBuffer(
hr = w->renderer->ReleaseBuffer(frame_count, w->renderer, frame_count,
AUDCLNT_BUFFERFLAGS_SILENT); AUDCLNT_BUFFERFLAGS_SILENT);
#else
hr = w->renderer->lpVtbl->ReleaseBuffer(w->renderer, frame_count,
AUDCLNT_BUFFERFLAGS_SILENT);
#endif
WASAPI_HR_CHECK(hr, "IAudioRenderClient::ReleaseBuffer", goto error); WASAPI_HR_CHECK(hr, "IAudioRenderClient::ReleaseBuffer", goto error);
#ifdef __cplusplus hr = _IAudioClient_Start(w->client);
hr = w->client->Start();
#else
hr = w->client->lpVtbl->Start(w->client);
#endif
WASAPI_HR_CHECK(hr, "IAudioClient::Start", goto error); WASAPI_HR_CHECK(hr, "IAudioClient::Start", goto error);
w->running = true; w->running = true;
w->blocking = settings->bools.audio_sync; w->blocking = settings->bools.audio_sync;
@ -741,21 +685,14 @@ static bool wasapi_flush(wasapi_t * w, const void * data, size_t size)
{ {
BYTE *dest = NULL; BYTE *dest = NULL;
UINT32 frame_count = size / w->frame_size; UINT32 frame_count = size / w->frame_size;
#ifdef __cplusplus HRESULT hr = _IAudioRenderClient_GetBuffer(
HRESULT hr = w->renderer->GetBuffer(frame_count, &dest); w->renderer, frame_count, &dest);
#else
HRESULT hr = w->renderer->lpVtbl->GetBuffer(w->renderer, frame_count, &dest);
#endif
WASAPI_HR_CHECK(hr, "IAudioRenderClient::GetBuffer", return false) WASAPI_HR_CHECK(hr, "IAudioRenderClient::GetBuffer", return false)
memcpy(dest, data, size); memcpy(dest, data, size);
#ifdef __cplusplus hr = _IAudioRenderClient_ReleaseBuffer(
hr = w->renderer->ReleaseBuffer(frame_count, 0); w->renderer, frame_count,
#else 0);
hr = w->renderer->lpVtbl->ReleaseBuffer(w->renderer, frame_count, 0);
#endif
WASAPI_HR_CHECK(hr, "IAudioRenderClient::ReleaseBuffer", return false); WASAPI_HR_CHECK(hr, "IAudioRenderClient::ReleaseBuffer", return false);
return true; return true;
@ -765,21 +702,14 @@ static bool wasapi_flush_buffer(wasapi_t * w, size_t size)
{ {
BYTE *dest = NULL; BYTE *dest = NULL;
UINT32 frame_count = size / w->frame_size; UINT32 frame_count = size / w->frame_size;
#ifdef __cplusplus HRESULT hr = _IAudioRenderClient_GetBuffer(
HRESULT hr = w->renderer->GetBuffer(frame_count, &dest); w->renderer, frame_count, &dest);
#else
HRESULT hr = w->renderer->lpVtbl->GetBuffer(w->renderer, frame_count, &dest);
#endif
WASAPI_HR_CHECK(hr, "IAudioRenderClient::GetBuffer", return false) WASAPI_HR_CHECK(hr, "IAudioRenderClient::GetBuffer", return false)
fifo_read(w->buffer, dest, size); fifo_read(w->buffer, dest, size);
#ifdef __cplusplus hr = _IAudioRenderClient_ReleaseBuffer(
hr = w->renderer->ReleaseBuffer(frame_count, 0); w->renderer, frame_count,
#else 0);
hr = w->renderer->lpVtbl->ReleaseBuffer(w->renderer, frame_count, 0);
#endif
WASAPI_HR_CHECK(hr, "IAudioRenderClient::ReleaseBuffer", return false); WASAPI_HR_CHECK(hr, "IAudioRenderClient::ReleaseBuffer", return false);
return true; return true;
@ -806,11 +736,7 @@ static ssize_t wasapi_write_sh(wasapi_t *w, const void * data, size_t size)
WASAPI_SR_CHECK(ir == WAIT_OBJECT_0, "WaitForSingleObject", return -1); WASAPI_SR_CHECK(ir == WAIT_OBJECT_0, "WaitForSingleObject", return -1);
} }
#ifdef __cplusplus hr = _IAudioClient_GetCurrentPadding(w->client, &padding);
hr = w->client->GetCurrentPadding(&padding);
#else
hr = w->client->lpVtbl->GetCurrentPadding(w->client, &padding);
#endif
WASAPI_HR_CHECK(hr, "IAudioClient::GetCurrentPadding", return -1); WASAPI_HR_CHECK(hr, "IAudioClient::GetCurrentPadding", return -1);
read_avail = fifo_read_avail(w->buffer); read_avail = fifo_read_avail(w->buffer);
@ -837,11 +763,7 @@ static ssize_t wasapi_write_sh(wasapi_t *w, const void * data, size_t size)
WASAPI_SR_CHECK(ir == WAIT_OBJECT_0, "WaitForSingleObject", return -1); WASAPI_SR_CHECK(ir == WAIT_OBJECT_0, "WaitForSingleObject", return -1);
} }
#ifdef __cplusplus hr = _IAudioClient_GetCurrentPadding(w->client, &padding);
hr = w->client->GetCurrentPadding(&padding);
#else
hr = w->client->lpVtbl->GetCurrentPadding(w->client, &padding);
#endif
WASAPI_HR_CHECK(hr, "IAudioClient::GetCurrentPadding", return -1); WASAPI_HR_CHECK(hr, "IAudioClient::GetCurrentPadding", return -1);
write_avail = w->engine_buffer_size - padding * w->frame_size; write_avail = w->engine_buffer_size - padding * w->frame_size;
@ -920,11 +842,7 @@ static ssize_t wasapi_write(void *wh, const void *data, size_t size)
static bool wasapi_stop(void *wh) static bool wasapi_stop(void *wh)
{ {
wasapi_t *w = (wasapi_t*)wh; wasapi_t *w = (wasapi_t*)wh;
#ifdef __cplusplus HRESULT hr = _IAudioClient_Stop(w->client);
HRESULT hr = w->client->Stop();
#else
HRESULT hr = w->client->lpVtbl->Stop(w->client);
#endif
WASAPI_HR_CHECK(hr, "IAudioClient::Stop", return !w->running); WASAPI_HR_CHECK(hr, "IAudioClient::Stop", return !w->running);
w->running = false; w->running = false;
@ -935,11 +853,7 @@ static bool wasapi_stop(void *wh)
static bool wasapi_start(void *wh, bool u) static bool wasapi_start(void *wh, bool u)
{ {
wasapi_t *w = (wasapi_t*)wh; wasapi_t *w = (wasapi_t*)wh;
#ifdef __cplusplus HRESULT hr = _IAudioClient_Start(w->client);
HRESULT hr = w->client->Start();
#else
HRESULT hr = w->client->lpVtbl->Start(w->client);
#endif
if (hr == AUDCLNT_E_NOT_STOPPED) if (hr == AUDCLNT_E_NOT_STOPPED)
return true; return true;
@ -975,13 +889,7 @@ static void wasapi_free(void *wh)
WASAPI_RELEASE(w->renderer); WASAPI_RELEASE(w->renderer);
if (w->client) if (w->client)
{ _IAudioClient_Stop(w->client);
#ifdef __cplusplus
w->client->Stop();
#else
w->client->lpVtbl->Stop(w->client);
#endif
}
WASAPI_RELEASE(w->client); WASAPI_RELEASE(w->client);
WASAPI_RELEASE(w->device); WASAPI_RELEASE(w->device);
CoUninitialize(); CoUninitialize();
@ -1039,36 +947,19 @@ static void *wasapi_device_list_new(void *u)
#endif #endif
WASAPI_HR_CHECK(hr, "CoCreateInstance", goto error); WASAPI_HR_CHECK(hr, "CoCreateInstance", goto error);
#ifdef __cplusplus hr = _IMMDeviceEnumerator_EnumAudioEndpoints(enumerator,
hr = enumerator->EnumAudioEndpoints(
eRender, DEVICE_STATE_ACTIVE, &collection); eRender, DEVICE_STATE_ACTIVE, &collection);
#else
hr = enumerator->lpVtbl->EnumAudioEndpoints(enumerator,
eRender, DEVICE_STATE_ACTIVE, &collection);
#endif
WASAPI_HR_CHECK(hr, "IMMDeviceEnumerator::EnumAudioEndpoints", goto error); WASAPI_HR_CHECK(hr, "IMMDeviceEnumerator::EnumAudioEndpoints", goto error);
#ifdef __cplusplus hr = _IMMDeviceCollection_GetCount(collection, &dev_count);
hr = collection->GetCount(&dev_count);
#else
hr = collection->lpVtbl->GetCount(collection, &dev_count);
#endif
WASAPI_HR_CHECK(hr, "IMMDeviceCollection::GetCount", goto error); WASAPI_HR_CHECK(hr, "IMMDeviceCollection::GetCount", goto error);
for (i = 0; i < dev_count; ++i) for (i = 0; i < dev_count; ++i)
{ {
#ifdef __cplusplus hr = _IMMDeviceCollection_Item(collection, i, &device);
hr = collection->Item(i, &device);
#else
hr = collection->lpVtbl->Item(collection, i, &device);
#endif
WASAPI_HR_CHECK(hr, "IMMDeviceCollection::Item", goto error); WASAPI_HR_CHECK(hr, "IMMDeviceCollection::Item", goto error);
#ifdef __cplusplus hr = _IMMDevice_GetId(device, &dev_id_wstr);
hr = device->GetId(&dev_id_wstr);
#else
hr = device->lpVtbl->GetId(device, &dev_id_wstr);
#endif
WASAPI_HR_CHECK(hr, "IMMDevice::GetId", goto error); WASAPI_HR_CHECK(hr, "IMMDevice::GetId", goto error);
ir = WideCharToMultiByte(CP_ACP, 0, dev_id_wstr, -1, ir = WideCharToMultiByte(CP_ACP, 0, dev_id_wstr, -1,
@ -1082,22 +973,13 @@ static void *wasapi_device_list_new(void *u)
dev_id_str, ir, NULL, NULL); dev_id_str, ir, NULL, NULL);
WASAPI_SR_CHECK(ir, "WideCharToMultiByte", goto error); WASAPI_SR_CHECK(ir, "WideCharToMultiByte", goto error);
#ifdef __cplusplus hr = _IMMDevice_OpenPropertyStore(device, STGM_READ, &prop_store);
hr = device->OpenPropertyStore(STGM_READ, &prop_store);
#else
hr = device->lpVtbl->OpenPropertyStore(device, STGM_READ, &prop_store);
#endif
WASAPI_HR_CHECK(hr, "IMMDevice::OpenPropertyStore", goto error); WASAPI_HR_CHECK(hr, "IMMDevice::OpenPropertyStore", goto error);
PropVariantInit(&prop_var); PropVariantInit(&prop_var);
prop_var_init = true; prop_var_init = true;
#ifdef __cplusplus hr = _IPropertyStore_GetValue(prop_store, PKEY_Device_FriendlyName,
hr = prop_store->GetValue( &prop_var);
PKEY_Device_FriendlyName, &prop_var);
#else
hr = prop_store->lpVtbl->GetValue(prop_store,
&PKEY_Device_FriendlyName, &prop_var);
#endif
WASAPI_HR_CHECK(hr, "IPropertyStore::GetValue", goto error); WASAPI_HR_CHECK(hr, "IPropertyStore::GetValue", goto error);
ir = WideCharToMultiByte(CP_ACP, 0, prop_var.pwszVal, -1, ir = WideCharToMultiByte(CP_ACP, 0, prop_var.pwszVal, -1,
@ -1164,11 +1046,7 @@ static size_t wasapi_write_avail(void *wh)
if (w->buffer) if (w->buffer)
return fifo_write_avail(w->buffer); return fifo_write_avail(w->buffer);
#ifdef __cplusplus hr = _IAudioClient_GetCurrentPadding(w->client, &padding);
hr = w->client->GetCurrentPadding(&padding);
#else
hr = w->client->lpVtbl->GetCurrentPadding(w->client, &padding);
#endif
WASAPI_HR_CHECK(hr, "IAudioClient::GetCurrentPadding", return 0); WASAPI_HR_CHECK(hr, "IAudioClient::GetCurrentPadding", return 0);
return w->engine_buffer_size - padding * w->frame_size; return w->engine_buffer_size - padding * w->frame_size;