From 58fa5561b8860fecc82f0dcabce7942cf29a14ed Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 21 May 2019 15:46:31 +0200 Subject: [PATCH] interface: get_registry always returns a Registry type --- pipewire-jack | 2 +- pipewire-pulseaudio | 2 +- src/examples/media-session.c | 1 - src/gst/gstpipewiredeviceprovider.c | 5 ++--- src/pipewire/interfaces.h | 5 +++-- src/tools/pipewire-cli.c | 1 - src/tools/pipewire-monitor.c | 1 - 7 files changed, 7 insertions(+), 10 deletions(-) diff --git a/pipewire-jack b/pipewire-jack index 6ce9b5acf..640a50091 160000 --- a/pipewire-jack +++ b/pipewire-jack @@ -1 +1 @@ -Subproject commit 6ce9b5acf76566ad1c14d0ca258c7cbb0c9284c7 +Subproject commit 640a50091ec972ecbb121b5f0928eb015435b0df diff --git a/pipewire-pulseaudio b/pipewire-pulseaudio index 71cab0c38..a1a5ae1d6 160000 --- a/pipewire-pulseaudio +++ b/pipewire-pulseaudio @@ -1 +1 @@ -Subproject commit 71cab0c38554946e9241806a131a8fe76fc26924 +Subproject commit a1a5ae1d6859b7ef2d55678e36fa5c9d458b1c65 diff --git a/src/examples/media-session.c b/src/examples/media-session.c index bd4601f02..b2229c7a3 100644 --- a/src/examples/media-session.c +++ b/src/examples/media-session.c @@ -1326,7 +1326,6 @@ static void on_state_changed(void *_data, enum pw_remote_state old, enum pw_remo &impl->core_listener, &core_events, impl); impl->registry_proxy = pw_core_proxy_get_registry(impl->core_proxy, - PW_TYPE_INTERFACE_Registry, PW_VERSION_REGISTRY, 0); pw_registry_proxy_add_listener(impl->registry_proxy, &impl->registry_listener, diff --git a/src/gst/gstpipewiredeviceprovider.c b/src/gst/gstpipewiredeviceprovider.c index 71c4ffa9d..8dad8f6b2 100644 --- a/src/gst/gstpipewiredeviceprovider.c +++ b/src/gst/gstpipewiredeviceprovider.c @@ -581,7 +581,7 @@ gst_pipewire_device_provider_probe (GstDeviceProvider * provider) self->devices = NULL; data->registry = pw_core_proxy_get_registry(self->core_proxy, - PW_TYPE_INTERFACE_Registry, PW_VERSION_REGISTRY, 0); + PW_VERSION_REGISTRY, 0); pw_registry_proxy_add_listener(data->registry, &data->registry_listener, ®istry_events, data); pw_core_proxy_sync(self->core_proxy, 0, self->seq++); @@ -667,8 +667,7 @@ gst_pipewire_device_provider_start (GstDeviceProvider * provider) GST_DEBUG_OBJECT (self, "connected"); self->registry = pw_core_proxy_get_registry(self->core_proxy, - PW_TYPE_INTERFACE_Registry, PW_VERSION_REGISTRY, 0); - + PW_VERSION_REGISTRY, 0); data->registry = self->registry; pw_registry_proxy_add_listener(self->registry, &data->registry_listener, ®istry_events, data); diff --git a/src/pipewire/interfaces.h b/src/pipewire/interfaces.h index a8b3680d9..8aa301d68 100644 --- a/src/pipewire/interfaces.h +++ b/src/pipewire/interfaces.h @@ -36,6 +36,7 @@ extern "C" { #include #include +#include #include #include @@ -220,9 +221,9 @@ pw_core_proxy_errorf(struct pw_core_proxy *core, uint32_t id, int seq, } static inline struct pw_registry_proxy * -pw_core_proxy_get_registry(struct pw_core_proxy *core, uint32_t type, uint32_t version, size_t user_data_size) +pw_core_proxy_get_registry(struct pw_core_proxy *core, uint32_t version, size_t user_data_size) { - struct pw_proxy *p = pw_proxy_new((struct pw_proxy*)core, type, user_data_size); + struct pw_proxy *p = pw_proxy_new((struct pw_proxy*)core, PW_TYPE_INTERFACE_Registry, user_data_size); pw_proxy_do((struct pw_proxy*)core, struct pw_core_proxy_methods, get_registry, version, pw_proxy_get_id(p)); return (struct pw_registry_proxy *) p; } diff --git a/src/tools/pipewire-cli.c b/src/tools/pipewire-cli.c index 521739f64..a26aa469a 100644 --- a/src/tools/pipewire-cli.c +++ b/src/tools/pipewire-cli.c @@ -400,7 +400,6 @@ static void on_state_changed(void *_data, enum pw_remote_state old, &rd->core_listener, &remote_core_events, rd); rd->registry_proxy = pw_core_proxy_get_registry(rd->core_proxy, - PW_TYPE_INTERFACE_Registry, PW_VERSION_REGISTRY, 0); pw_registry_proxy_add_listener(rd->registry_proxy, &rd->registry_listener, diff --git a/src/tools/pipewire-monitor.c b/src/tools/pipewire-monitor.c index adc399c14..deeec1fd7 100644 --- a/src/tools/pipewire-monitor.c +++ b/src/tools/pipewire-monitor.c @@ -702,7 +702,6 @@ static void on_state_changed(void *_data, enum pw_remote_state old, &data->core_listener, &core_events, data); data->registry_proxy = pw_core_proxy_get_registry(data->core_proxy, - PW_TYPE_INTERFACE_Registry, PW_VERSION_REGISTRY, 0); pw_registry_proxy_add_listener(data->registry_proxy, &data->registry_listener,