From 261cb91c62823b50815428ecce3904cfcc0553dd Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Wed, 20 Sep 2023 17:25:08 -0300 Subject: [PATCH] linux-pipewire: Rename a function Make it a bit more semantic, and matching of PipeWire API. --- plugins/linux-pipewire/pipewire.c | 6 +++--- plugins/linux-pipewire/pipewire.h | 6 +++--- plugins/linux-pipewire/screencast-portal.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/linux-pipewire/pipewire.c b/plugins/linux-pipewire/pipewire.c index 4b6c747cf..bf7f57848 100644 --- a/plugins/linux-pipewire/pipewire.c +++ b/plugins/linux-pipewire/pipewire.c @@ -1168,9 +1168,9 @@ static const struct pw_core_events core_events = { /* obs_source_info methods */ obs_pipewire * -obs_pipewire_create(int pipewire_fd, - const struct pw_registry_events *registry_events, - void *user_data) +obs_pipewire_connect_fd(int pipewire_fd, + const struct pw_registry_events *registry_events, + void *user_data) { obs_pipewire *obs_pw; diff --git a/plugins/linux-pipewire/pipewire.h b/plugins/linux-pipewire/pipewire.h index eca6e97bf..36b7689ee 100644 --- a/plugins/linux-pipewire/pipewire.h +++ b/plugins/linux-pipewire/pipewire.h @@ -36,9 +36,9 @@ struct obs_pipwire_connect_stream_info { }; obs_pipewire * -obs_pipewire_create(int pipewire_fd, - const struct pw_registry_events *registry_events, - void *user_data); +obs_pipewire_connect_fd(int pipewire_fd, + const struct pw_registry_events *registry_events, + void *user_data); struct pw_registry *obs_pipewire_get_registry(obs_pipewire *obs_pw); void obs_pipewire_roundtrip(obs_pipewire *obs_pw); void obs_pipewire_destroy(obs_pipewire *obs_pw); diff --git a/plugins/linux-pipewire/screencast-portal.c b/plugins/linux-pipewire/screencast-portal.c index 52bf2c7d6..0a1ff2118 100644 --- a/plugins/linux-pipewire/screencast-portal.c +++ b/plugins/linux-pipewire/screencast-portal.c @@ -188,7 +188,7 @@ static void on_pipewire_remote_opened_cb(GObject *source, GAsyncResult *res, return; } - capture->obs_pw = obs_pipewire_create(pipewire_fd, NULL, NULL); + capture->obs_pw = obs_pipewire_connect_fd(pipewire_fd, NULL, NULL); if (!capture->obs_pw) return;