pw_registry_proxy -> pw_registry

This commit is contained in:
Wim Taymans 2019-12-11 09:44:48 +01:00
parent ecc6b27cd7
commit 49d736bbb7
17 changed files with 140 additions and 141 deletions

View file

@ -51,7 +51,7 @@ struct data {
struct pw_core *core;
struct spa_hook core_listener;
struct pw_registry_proxy *registry_proxy;
struct pw_registry *registry;
struct spa_hook registry_listener;
struct spa_list globals;
@ -670,7 +670,7 @@ static void registry_event_global(void *data, uint32_t id, uint32_t permissions,
return;
}
proxy = pw_registry_proxy_bind(d->registry_proxy, id, type,
proxy = pw_registry_bind(d->registry, id, type,
client_version,
sizeof(struct global));
if (proxy == NULL)
@ -697,8 +697,8 @@ static void registry_event_global(void *data, uint32_t id, uint32_t permissions,
spa_list_insert(&d->globals, &g->link);
}
static const struct pw_registry_proxy_events registry_events = {
PW_VERSION_REGISTRY_PROXY_EVENTS,
static const struct pw_registry_events registry_events = {
PW_VERSION_REGISTRY_EVENTS,
.global = registry_event_global,
};
@ -833,9 +833,9 @@ int main(int argc, char *argv[])
pw_core_add_listener(data.core,
&data.core_listener,
&core_events, &data);
data.registry_proxy = pw_core_get_registry(data.core,
PW_VERSION_REGISTRY_PROXY, 0);
pw_registry_proxy_add_listener(data.registry_proxy,
data.registry = pw_core_get_registry(data.core,
PW_VERSION_REGISTRY, 0);
pw_registry_add_listener(data.registry,
&data.registry_listener,
&registry_events, &data);