mirror/miniaudio
1
0
Fork 0
mirror of https://github.com/mackron/miniaudio.git synced 2026-04-24 01:04:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

JACK: Implement the new device enumeration APIs.

Browse Source
This commit is contained in:
David Reid
2018-03-18 06:47:19 +10:00
parent 90269f6c1a
commit 789bd23246
1 changed files with 70 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mini_al.h
+70 -6
View File
@@ -10869,14 +10869,57 @@ typedef const char* (* mal_jack_port_name_proc) (const mal_
typedef void* (* mal_jack_port_get_buffer_proc) (mal_jack_port_t* port, mal_jack_nframes_t nframes); typedef void* (* mal_jack_port_get_buffer_proc) (mal_jack_port_t* port, mal_jack_nframes_t nframes);
typedef void (* mal_jack_free_proc) (void* ptr); typedef void (* mal_jack_free_proc) (void* ptr);
static mal_result mal_context_uninit__jack(mal_context* pContext) mal_bool32 mal_context_is_device_id_equal__jack(mal_context* pContext, const mal_device_id* pID0, const mal_device_id* pID1)
{ {
mal_assert(pContext != NULL); mal_assert(pContext != NULL);
mal_assert(pContext->backend == mal_backend_jack); mal_assert(pID0 != NULL);
mal_assert(pID1 != NULL);
(void)pContext;
#ifndef MAL_NO_RUNTIME_LINKING return pID0->jack == pID1->jack;
mal_dlclose(pContext->jack.jackSO); }
#endif
mal_result mal_context_enumerate_devices__jack(mal_context* pContext, mal_enum_devices_callback_proc callback, void* pUserData)
{
mal_assert(pContext != NULL);
mal_assert(callback != NULL);
mal_bool32 cbResult = MAL_TRUE;
// Playback.
if (cbResult) {
mal_device_info deviceInfo;
mal_zero_object(&deviceInfo);
mal_strcpy_s(deviceInfo.name, sizeof(deviceInfo.name), MAL_DEFAULT_PLAYBACK_DEVICE_NAME);
cbResult = callback(pContext, mal_device_type_playback, &deviceInfo, pUserData);
}
// Capture.
if (cbResult) {
mal_device_info deviceInfo;
mal_zero_object(&deviceInfo);
mal_strcpy_s(deviceInfo.name, sizeof(deviceInfo.name), MAL_DEFAULT_CAPTURE_DEVICE_NAME);
cbResult = callback(pContext, mal_device_type_capture, &deviceInfo, pUserData);
}
return MAL_SUCCESS;
}
mal_result mal_context_get_device_info__jack(mal_context* pContext, mal_device_type deviceType, const mal_device_id* pDeviceID, mal_share_mode shareMode, mal_device_info* pDeviceInfo)
{
mal_assert(pContext != NULL);
(void)shareMode;
if (pDeviceID != NULL && pDeviceID->jack != 0) {
return MAL_NO_DEVICE; // Don't know the device.
}
// Name / Description
if (deviceType == mal_device_type_playback) {
mal_strcpy_s(pDeviceInfo->name, sizeof(pDeviceInfo->name), MAL_DEFAULT_PLAYBACK_DEVICE_NAME);
} else {
mal_strcpy_s(pDeviceInfo->name, sizeof(pDeviceInfo->name), MAL_DEFAULT_CAPTURE_DEVICE_NAME);
}
return MAL_SUCCESS; return MAL_SUCCESS;
} }
@@ -10961,6 +11004,22 @@ static mal_result mal_context_init__jack(mal_context* pContext)
pContext->jack.jack_free = (mal_proc)_jack_free; pContext->jack.jack_free = (mal_proc)_jack_free;
#endif #endif
pContext->onDeviceIDEqual = mal_context_is_device_id_equal__jack;
pContext->onEnumDevices = mal_context_enumerate_devices__jack;
pContext->onGetDeviceInfo = mal_context_get_device_info__jack;
return MAL_SUCCESS;
}
static mal_result mal_context_uninit__jack(mal_context* pContext)
{
mal_assert(pContext != NULL);
mal_assert(pContext->backend == mal_backend_jack);
#ifndef MAL_NO_RUNTIME_LINKING
mal_dlclose(pContext->jack.jackSO);
#endif
return MAL_SUCCESS; return MAL_SUCCESS;
} }
@@ -11084,7 +11143,12 @@ mal_result mal_device_init__jack(mal_context* pContext, mal_device_type type, ma
mal_assert(pDevice != NULL); mal_assert(pDevice != NULL);
(void)pContext; (void)pContext;
(void)pDeviceID; // Only supporting default devices with JACK.
// Only supporting default devices with JACK.
if (pDeviceID != NULL && pDeviceID->jack != 0) {
return MAL_NO_DEVICE;
}
// Open the client. // Open the client.
size_t maxClientNameSize = ((mal_jack_client_name_size_proc)pContext->jack.jack_client_name_size)(); // Includes null terminator. size_t maxClientNameSize = ((mal_jack_client_name_size_proc)pContext->jack.jack_client_name_size)(); // Includes null terminator.