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

Add support for JACK to the Windows build.

Browse Source
This commit is contained in:
David Reid
2018-03-05 22:31:19 +10:00
parent effed2d4a8
commit 2d885e9dc8
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mini_al.h
+6 -4
View File
@@ -240,6 +240,7 @@ extern "C" {
#if defined(MAL_WIN32_DESKTOP) // DirectSound and WinMM backends are only supported on desktop's. #if defined(MAL_WIN32_DESKTOP) // DirectSound and WinMM backends are only supported on desktop's.
#define MAL_SUPPORT_DSOUND #define MAL_SUPPORT_DSOUND
#define MAL_SUPPORT_WINMM #define MAL_SUPPORT_WINMM
#define MAL_SUPPORT_JACK // JACK is technically supported on Windows, but I don't know how many people use it in practice...
#endif #endif
// Don't support WASAPI on older versions of MSVC for now. // Don't support WASAPI on older versions of MSVC for now.
@@ -8504,6 +8505,7 @@ 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.
// 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.
@@ -8560,7 +8562,7 @@ mal_result mal_device_init__jack(mal_context* pContext, mal_device_type type, ma
pDevice->jack.pPorts[pDevice->internalChannels] = ((mal_jack_port_register_proc)pContext->jack.jack_port_register)((mal_jack_client_t*)pDevice->jack.pClient, name, MAL_JACK_DEFAULT_AUDIO_TYPE, clientPortFlags, 0); pDevice->jack.pPorts[pDevice->internalChannels] = ((mal_jack_port_register_proc)pContext->jack.jack_port_register)((mal_jack_client_t*)pDevice->jack.pClient, name, MAL_JACK_DEFAULT_AUDIO_TYPE, clientPortFlags, 0);
if (pDevice->jack.pPorts[pDevice->internalChannels] == NULL) { if (pDevice->jack.pPorts[pDevice->internalChannels] == NULL) {
((mal_jack_free_proc)pContext->jack.jack_free)(ppPorts); ((mal_jack_free_proc)pContext->jack.jack_free)((void*)ppPorts);
mal_device_uninit__jack(pDevice); mal_device_uninit__jack(pDevice);
return mal_post_error(pDevice, "[JACK] Failed to register ports.", MAL_FAILED_TO_OPEN_BACKEND_DEVICE); return mal_post_error(pDevice, "[JACK] Failed to register ports.", MAL_FAILED_TO_OPEN_BACKEND_DEVICE);
} }
@@ -8568,7 +8570,7 @@ mal_result mal_device_init__jack(mal_context* pContext, mal_device_type type, ma
pDevice->internalChannels += 1; pDevice->internalChannels += 1;
} }
((mal_jack_free_proc)pContext->jack.jack_free)(ppPorts); ((mal_jack_free_proc)pContext->jack.jack_free)((void*)ppPorts);
ppPorts = NULL; ppPorts = NULL;
// We set the sample rate here, but apparently this can change. This is incompatible with mini_al, so changing sample rates will not be supported. // We set the sample rate here, but apparently this can change. This is incompatible with mini_al, so changing sample rates will not be supported.
@@ -8630,13 +8632,13 @@ static mal_result mal_device__start_backend__jack(mal_device* pDevice)
} }
if (resultJACK != 0) { if (resultJACK != 0) {
((mal_jack_free_proc)pContext->jack.jack_free)(ppServerPorts); ((mal_jack_free_proc)pContext->jack.jack_free)((void*)ppServerPorts);
((mal_jack_deactivate_proc)pContext->jack.jack_deactivate)((mal_jack_client_t*)pDevice->jack.pClient); ((mal_jack_deactivate_proc)pContext->jack.jack_deactivate)((mal_jack_client_t*)pDevice->jack.pClient);
return mal_post_error(pDevice, "[JACK] Failed to connect ports.", MAL_ERROR); return mal_post_error(pDevice, "[JACK] Failed to connect ports.", MAL_ERROR);
} }
} }
((mal_jack_free_proc)pContext->jack.jack_free)(ppServerPorts); ((mal_jack_free_proc)pContext->jack.jack_free)((void*)ppServerPorts);
return MAL_SUCCESS; return MAL_SUCCESS;
} }