mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-06 13:30:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pw_registry_proxy -> pw_registry

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

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

@ -77,7 +77,7 @@ struct remote_data {
struct pw_core *core;
struct spa_hook core_listener;
struct spa_hook proxy_core_listener;
struct pw_registry_proxy *registry_proxy;
struct pw_registry *registry;
struct spa_hook registry_listener;
struct pw_map globals;
@ -364,8 +364,8 @@ static void registry_event_global_remove(void *data, uint32_t id)
destroy_global(global, rd);
}
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,
.global_remove = registry_event_global_remove,
};
@ -444,9 +444,8 @@ static bool do_connect(struct data *data, const char *cmd, char *args, char **er
pw_proxy_add_listener((struct pw_proxy*)rd->core,
&rd->proxy_core_listener,
&proxy_core_events, rd);
rd->registry_proxy = pw_core_get_registry(rd->core,
PW_VERSION_REGISTRY_PROXY, 0);
pw_registry_proxy_add_listener(rd->registry_proxy,
rd->registry = pw_core_get_registry(rd->core, PW_VERSION_REGISTRY, 0);
pw_registry_add_listener(rd->registry,
&rd->registry_listener,
&registry_events, rd);
rd->prompt_pending = pw_core_sync(rd->core, 0, 0);
@ -1166,7 +1165,7 @@ static bool bind_global(struct remote_data *rd, struct global *global, char **er
return false;
}
proxy = pw_registry_proxy_bind(rd->registry_proxy,
proxy = pw_registry_bind(rd->registry,
global->id,
global->type,
client_version,
@ -1338,7 +1337,7 @@ static bool do_destroy(struct data *data, const char *cmd, char *args, char **er
asprintf(error, "%s: unknown global %d", cmd, id);
return false;
}
pw_registry_proxy_destroy(rd->registry_proxy, id);
pw_registry_destroy(rd->registry, id);
return true;
}

14
src/tools/pipewire-dot.c
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);

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

@ -53,7 +53,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 pending_list;
@ -628,7 +628,7 @@ static void registry_event_global(void *data, uint32_t id,
return;
}
proxy = pw_registry_proxy_bind(d->registry_proxy, id, type,
proxy = pw_registry_bind(d->registry, id, type,
client_version,
sizeof(struct proxy_data));
if (proxy == NULL)
@ -661,8 +661,8 @@ static void registry_event_global_remove(void *object, uint32_t id)
printf("\tid: %u\n", id);
}
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,
.global_remove = registry_event_global_remove,
};
@ -723,9 +723,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);