mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

interface: get_registry always returns a Registry type

Browse source
This commit is contained in:
Wim Taymans 2019-05-21 15:46:31 +02:00
parent a564d9f3f1
commit 58fa5561b8
7 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pipewire-jack

@ -1 +1 @@
Subproject commit 6ce9b5acf76566ad1c14d0ca258c7cbb0c9284c7
Subproject commit 640a50091ec972ecbb121b5f0928eb015435b0df

2
pipewire-pulseaudio

@ -1 +1 @@
Subproject commit 71cab0c38554946e9241806a131a8fe76fc26924
Subproject commit a1a5ae1d6859b7ef2d55678e36fa5c9d458b1c65

1
src/examples/media-session.c
View file

@ -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,

5
src/gst/gstpipewiredeviceprovider.c
View file

@ -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, &registry_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, &registry_events, data);

5
src/pipewire/interfaces.h
View file

@ -36,6 +36,7 @@ extern "C" {
#include <spa/param/param.h>
#include <pipewire/introspect.h>
#include <pipewire/type.h>
#include <pipewire/proxy.h>
#include <pipewire/permission.h>
@ -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;
}

1
src/tools/pipewire-cli.c
View file

@ -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,

1
src/tools/pipewire-monitor.c
View file

@ -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,