encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge commit '4fbd60b81714f8f93946520147cb0c1f05faee64' into main

This commit is contained in:
Sam Lantinga 2021-03-15 09:00:23 -07:00
parent 713a04721c 4fbd60b817
commit 7ca94f5998
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/audio/pipewire/SDL_pipewire.c
View File

@ -615,7 +615,7 @@ registry_event_global_callback(void *object, uint32_t id, uint32_t permissions,
const char *media_class = spa_dict_lookup(props, PW_KEY_MEDIA_CLASS); const char *media_class = spa_dict_lookup(props, PW_KEY_MEDIA_CLASS);
if (media_class) { if (media_class) {
const char * node_nick, *node_desc; const char * node_desc;
struct io_node *io; struct io_node *io;
SDL_bool is_capture; SDL_bool is_capture;
int str_buffer_len; int str_buffer_len;
@ -629,10 +629,9 @@ registry_event_global_callback(void *object, uint32_t id, uint32_t permissions,
return; return;
} }
node_nick = spa_dict_lookup(props, PW_KEY_NODE_NICK);
node_desc = spa_dict_lookup(props, PW_KEY_NODE_DESCRIPTION); node_desc = spa_dict_lookup(props, PW_KEY_NODE_DESCRIPTION);
if (node_nick && node_desc) { if (node_desc) {
node = node_object_new(id, type, version, &interface_node_events, &interface_core_events); node = node_object_new(id, type, version, &interface_node_events, &interface_core_events);
if (node == NULL) { if (node == NULL) {
SDL_SetError("Pipewire: Failed to allocate interface node"); SDL_SetError("Pipewire: Failed to allocate interface node");
@ -640,7 +639,7 @@ registry_event_global_callback(void *object, uint32_t id, uint32_t permissions,
} }
/* Allocate and initialize the I/O node information struct */ /* Allocate and initialize the I/O node information struct */
str_buffer_len = SDL_strlen(node_nick) + SDL_strlen(node_desc) + 3; str_buffer_len = SDL_strlen(node_desc) + 1;
node->userdata = io = SDL_calloc(1, sizeof(struct io_node) + str_buffer_len); node->userdata = io = SDL_calloc(1, sizeof(struct io_node) + str_buffer_len);
if (io == NULL) { if (io == NULL) {
node_object_destroy(node); node_object_destroy(node);
@ -652,7 +651,7 @@ registry_event_global_callback(void *object, uint32_t id, uint32_t permissions,
io->id = id; io->id = id;
io->is_capture = is_capture; io->is_capture = is_capture;
io->spec.format = AUDIO_F32; /* Pipewire uses floats internally, other formats require conversion. */ io->spec.format = AUDIO_F32; /* Pipewire uses floats internally, other formats require conversion. */
SDL_snprintf(io->name, str_buffer_len, "%s: %s", node_nick, node_desc); SDL_strlcpy(io->name, node_desc, str_buffer_len);
/* Update sync points */ /* Update sync points */
hotplug_core_sync(node); hotplug_core_sync(node);