From 5065e86bb98a317da6f2656850bd29ea51dc2a58 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Fri, 1 Jul 2022 17:00:21 -0300 Subject: [PATCH] linux-pipewire: Remove unnecessary struct field We don't actually need to restore the node id anymore, since this is handled by the screencast-portal.c code now. Remove the pipewire_node field, and just create the stream directly from the passed file descriptor now. --- plugins/linux-pipewire/pipewire.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins/linux-pipewire/pipewire.c b/plugins/linux-pipewire/pipewire.c index 04f5ca60b..8329a39da 100644 --- a/plugins/linux-pipewire/pipewire.c +++ b/plugins/linux-pipewire/pipewire.c @@ -53,7 +53,6 @@ struct format_info { }; struct _obs_pipewire_data { - uint32_t pipewire_node; int pipewire_fd; gs_texture_t *texture; @@ -805,7 +804,6 @@ obs_pipewire_data *obs_pipewire_create(int pipewire_fd, int pipewire_node, obs_pw = bzalloc(sizeof(obs_pipewire_data)); obs_pw->pipewire_fd = pipewire_fd; - obs_pw->pipewire_node = pipewire_node; init_format_info(obs_pw); @@ -867,7 +865,7 @@ obs_pipewire_data *obs_pipewire_create(int pipewire_fd, int pipewire_node, } pw_stream_connect( - obs_pw->stream, PW_DIRECTION_INPUT, obs_pw->pipewire_node, + obs_pw->stream, PW_DIRECTION_INPUT, pipewire_node, PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_MAP_BUFFERS, params, n_params);