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

pw_client_proxy -> pw_client

Browse source
This commit is contained in:
Wim Taymans 2019-12-11 14:53:39 +01:00
parent aa378417c2
commit a8f1d756c3
17 changed files with 108 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pipewire-pulseaudio/src/context.c
View file

@ -527,8 +527,8 @@ static void client_event_info(void *object, const struct pw_client_info *info)
g->pending_seq = pw_proxy_sync(g->proxy, 0); g->pending_seq = pw_proxy_sync(g->proxy, 0);
} }
static const struct pw_client_proxy_events client_events = { static const struct pw_client_events client_events = {
PW_VERSION_CLIENT_PROXY_EVENTS, PW_VERSION_CLIENT_EVENTS,
.info = client_event_info, .info = client_event_info,
}; };
@ -688,7 +688,7 @@ static int set_mask(pa_context *c, struct global *g)
g->mask = PA_SUBSCRIPTION_MASK_CLIENT; g->mask = PA_SUBSCRIPTION_MASK_CLIENT;
g->event = PA_SUBSCRIPTION_EVENT_CLIENT; g->event = PA_SUBSCRIPTION_EVENT_CLIENT;
events = &client_events; events = &client_events;
client_version = PW_VERSION_CLIENT_PROXY; client_version = PW_VERSION_CLIENT;
destroy = client_destroy; destroy = client_destroy;
break; break;
@ -1196,10 +1196,10 @@ pa_operation* pa_context_set_name(pa_context *c, const char *name, pa_context_su
changed = pw_properties_update(c->props, &dict); changed = pw_properties_update(c->props, &dict);
if (changed) { if (changed) {
struct pw_client_proxy *client_proxy; struct pw_client *client;
client_proxy = pw_core_get_client_proxy(c->core); client = pw_core_get_client(c->core);
pw_client_proxy_update_properties(client_proxy, &c->props->dict); pw_client_update_properties(client, &c->props->dict);
} }
o = pa_operation_new(c, NULL, on_success, sizeof(struct success_data)); o = pa_operation_new(c, NULL, on_success, sizeof(struct success_data));

4
src/examples/export-sink.c
View file

@ -489,8 +489,8 @@ static void set_permissions(struct data *data)
permissions[1].id = SPA_ID_INVALID; permissions[1].id = SPA_ID_INVALID;
permissions[1].permissions = PW_PERM_R; permissions[1].permissions = PW_PERM_R;
pw_client_proxy_update_permissions( pw_client_update_permissions(
pw_core_get_client_proxy(data->core), pw_core_get_client(data->core),
2, permissions); 2, permissions);
} }

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

@ -287,8 +287,8 @@ static void client_event_info(void *object, const struct pw_client_info *info)
pw_proxy_sync(client->obj.proxy, 1); pw_proxy_sync(client->obj.proxy, 1);
} }
static const struct pw_client_proxy_events client_events = { static const struct pw_client_events client_events = {
PW_VERSION_CLIENT_PROXY_EVENTS, PW_VERSION_CLIENT_EVENTS,
.info = client_event_info, .info = client_event_info,
}; };
@ -301,7 +301,7 @@ static void client_destroy(void *object)
static const struct object_info client_info = { static const struct object_info client_info = {
.type = PW_TYPE_INTERFACE_Client, .type = PW_TYPE_INTERFACE_Client,
.version = PW_VERSION_CLIENT_PROXY, .version = PW_VERSION_CLIENT,
.events = &client_events, .events = &client_events,
.size = sizeof(struct sm_client), .size = sizeof(struct sm_client),
.init = NULL, .init = NULL,

2
src/examples/media-session/policy-ep.c
View file

@ -494,7 +494,7 @@ static int rescan_endpoint(struct impl *impl, struct endpoint *ep)
obj = sm_media_session_find_object(impl->session, ep->client_id); obj = sm_media_session_find_object(impl->session, ep->client_id);
if (obj && obj->type == PW_TYPE_INTERFACE_Client) { if (obj && obj->type == PW_TYPE_INTERFACE_Client) {
pw_client_proxy_error((struct pw_client_proxy*)obj->proxy, pw_client_error((struct pw_client*)obj->proxy,
ep->id, -ENOENT, "no endpoint available"); ep->id, -ENOENT, "no endpoint available");
} }
return -ENOENT; return -ENOENT;

58
src/modules/module-protocol-native/protocol-native.c
View file

@ -1481,7 +1481,7 @@ static int port_demarshal_enum_params(void *object, const struct pw_protocol_nat
static int client_method_marshal_add_listener(void *object, static int client_method_marshal_add_listener(void *object,
struct spa_hook *listener, struct spa_hook *listener,
const struct pw_client_proxy_events *events, const struct pw_client_events *events,
void *data) void *data)
{ {
struct pw_proxy *proxy = object; struct pw_proxy *proxy = object;
@ -1495,7 +1495,7 @@ static void client_marshal_info(void *object, const struct pw_client_info *info)
struct spa_pod_builder *b; struct spa_pod_builder *b;
struct spa_pod_frame f; struct spa_pod_frame f;
b = pw_protocol_native_begin_resource(resource, PW_CLIENT_PROXY_EVENT_INFO, NULL); b = pw_protocol_native_begin_resource(resource, PW_CLIENT_EVENT_INFO, NULL);
spa_pod_builder_push_struct(b, &f); spa_pod_builder_push_struct(b, &f);
spa_pod_builder_add(b, spa_pod_builder_add(b,
@ -1533,7 +1533,7 @@ static int client_demarshal_info(void *object, const struct pw_protocol_native_m
if (parse_dict(&prs, &props) < 0) if (parse_dict(&prs, &props) < 0)
return -EINVAL; return -EINVAL;
return pw_proxy_notify(proxy, struct pw_client_proxy_events, info, 0, &info); return pw_proxy_notify(proxy, struct pw_client_events, info, 0, &info);
} }
static void client_marshal_permissions(void *object, uint32_t index, uint32_t n_permissions, static void client_marshal_permissions(void *object, uint32_t index, uint32_t n_permissions,
@ -1544,7 +1544,7 @@ static void client_marshal_permissions(void *object, uint32_t index, uint32_t n_
struct spa_pod_frame f[2]; struct spa_pod_frame f[2];
uint32_t i, n = 0; uint32_t i, n = 0;
b = pw_protocol_native_begin_resource(resource, PW_CLIENT_PROXY_EVENT_PERMISSIONS, NULL); b = pw_protocol_native_begin_resource(resource, PW_CLIENT_EVENT_PERMISSIONS, NULL);
for (i = 0; i < n_permissions; i++) { for (i = 0; i < n_permissions; i++) {
if (permissions[i].permissions != SPA_ID_INVALID) if (permissions[i].permissions != SPA_ID_INVALID)
@ -1594,7 +1594,7 @@ static int client_demarshal_permissions(void *object, const struct pw_protocol_n
SPA_POD_Int(&permissions[i].permissions), NULL) < 0) SPA_POD_Int(&permissions[i].permissions), NULL) < 0)
return -EINVAL; return -EINVAL;
} }
return pw_proxy_notify(proxy, struct pw_client_proxy_events, permissions, 0, index, n_permissions, permissions); return pw_proxy_notify(proxy, struct pw_client_events, permissions, 0, index, n_permissions, permissions);
} }
static int client_marshal_error(void *object, uint32_t id, int res, const char *error) static int client_marshal_error(void *object, uint32_t id, int res, const char *error)
@ -1602,7 +1602,7 @@ static int client_marshal_error(void *object, uint32_t id, int res, const char *
struct pw_proxy *proxy = object; struct pw_proxy *proxy = object;
struct spa_pod_builder *b; struct spa_pod_builder *b;
b = pw_protocol_native_begin_proxy(proxy, PW_CLIENT_PROXY_METHOD_ERROR, NULL); b = pw_protocol_native_begin_proxy(proxy, PW_CLIENT_METHOD_ERROR, NULL);
spa_pod_builder_add_struct(b, spa_pod_builder_add_struct(b,
SPA_POD_Int(id), SPA_POD_Int(id),
SPA_POD_Int(res), SPA_POD_Int(res),
@ -1624,7 +1624,7 @@ static int client_demarshal_error(void *object, const struct pw_protocol_native_
SPA_POD_String(&error)) < 0) SPA_POD_String(&error)) < 0)
return -EINVAL; return -EINVAL;
return pw_resource_notify(resource, struct pw_client_proxy_methods, error, 0, id, res, error); return pw_resource_notify(resource, struct pw_client_methods, error, 0, id, res, error);
} }
static int client_marshal_get_permissions(void *object, uint32_t index, uint32_t num) static int client_marshal_get_permissions(void *object, uint32_t index, uint32_t num)
@ -1632,7 +1632,7 @@ static int client_marshal_get_permissions(void *object, uint32_t index, uint32_t
struct pw_proxy *proxy = object; struct pw_proxy *proxy = object;
struct spa_pod_builder *b; struct spa_pod_builder *b;
b = pw_protocol_native_begin_proxy(proxy, PW_CLIENT_PROXY_METHOD_GET_PERMISSIONS, NULL); b = pw_protocol_native_begin_proxy(proxy, PW_CLIENT_METHOD_GET_PERMISSIONS, NULL);
spa_pod_builder_add_struct(b, spa_pod_builder_add_struct(b,
SPA_POD_Int(index), SPA_POD_Int(index),
@ -1647,7 +1647,7 @@ static int client_marshal_update_properties(void *object, const struct spa_dict
struct spa_pod_builder *b; struct spa_pod_builder *b;
struct spa_pod_frame f; struct spa_pod_frame f;
b = pw_protocol_native_begin_proxy(proxy, PW_CLIENT_PROXY_METHOD_UPDATE_PROPERTIES, NULL); b = pw_protocol_native_begin_proxy(proxy, PW_CLIENT_METHOD_UPDATE_PROPERTIES, NULL);
spa_pod_builder_push_struct(b, &f); spa_pod_builder_push_struct(b, &f);
push_dict(b, props); push_dict(b, props);
@ -1674,7 +1674,7 @@ static int client_demarshal_update_properties(void *object, const struct pw_prot
if (parse_dict(&prs, &props) < 0) if (parse_dict(&prs, &props) < 0)
return -EINVAL; return -EINVAL;
return pw_resource_notify(resource, struct pw_client_proxy_methods, update_properties, 0, return pw_resource_notify(resource, struct pw_client_methods, update_properties, 0,
&props); &props);
} }
@ -1690,7 +1690,7 @@ static int client_demarshal_get_permissions(void *object, const struct pw_protoc
SPA_POD_Int(&num)) < 0) SPA_POD_Int(&num)) < 0)
return -EINVAL; return -EINVAL;
return pw_resource_notify(resource, struct pw_client_proxy_methods, get_permissions, 0, index, num); return pw_resource_notify(resource, struct pw_client_methods, get_permissions, 0, index, num);
} }
static int client_marshal_update_permissions(void *object, uint32_t n_permissions, static int client_marshal_update_permissions(void *object, uint32_t n_permissions,
@ -1701,7 +1701,7 @@ static int client_marshal_update_permissions(void *object, uint32_t n_permission
struct spa_pod_frame f; struct spa_pod_frame f;
uint32_t i; uint32_t i;
b = pw_protocol_native_begin_proxy(proxy, PW_CLIENT_PROXY_METHOD_UPDATE_PERMISSIONS, NULL); b = pw_protocol_native_begin_proxy(proxy, PW_CLIENT_METHOD_UPDATE_PERMISSIONS, NULL);
spa_pod_builder_push_struct(b, &f); spa_pod_builder_push_struct(b, &f);
spa_pod_builder_int(b, n_permissions); spa_pod_builder_int(b, n_permissions);
@ -1735,7 +1735,7 @@ static int client_demarshal_update_permissions(void *object, const struct pw_pro
SPA_POD_Int(&permissions[i].permissions), NULL) < 0) SPA_POD_Int(&permissions[i].permissions), NULL) < 0)
return -EINVAL; return -EINVAL;
} }
return pw_resource_notify(resource, struct pw_client_proxy_methods, update_permissions, 0, return pw_resource_notify(resource, struct pw_client_methods, update_permissions, 0,
n_permissions, permissions); n_permissions, permissions);
} }
@ -2184,8 +2184,8 @@ static const struct pw_protocol_marshal pw_protocol_native_port_marshal = {
.client_demarshal = pw_protocol_native_port_event_demarshal, .client_demarshal = pw_protocol_native_port_event_demarshal,
}; };
static const struct pw_client_proxy_methods pw_protocol_native_client_method_marshal = { static const struct pw_client_methods pw_protocol_native_client_method_marshal = {
PW_VERSION_CLIENT_PROXY_METHODS, PW_VERSION_CLIENT_METHODS,
.add_listener = &client_method_marshal_add_listener, .add_listener = &client_method_marshal_add_listener,
.error = &client_marshal_error, .error = &client_marshal_error,
.update_properties = &client_marshal_update_properties, .update_properties = &client_marshal_update_properties,
@ -2194,34 +2194,34 @@ static const struct pw_client_proxy_methods pw_protocol_native_client_method_mar
}; };
static const struct pw_protocol_native_demarshal static const struct pw_protocol_native_demarshal
pw_protocol_native_client_method_demarshal[PW_CLIENT_PROXY_METHOD_NUM] = pw_protocol_native_client_method_demarshal[PW_CLIENT_METHOD_NUM] =
{ {
[PW_CLIENT_PROXY_METHOD_ADD_LISTENER] = { NULL, 0, }, [PW_CLIENT_METHOD_ADD_LISTENER] = { NULL, 0, },
[PW_CLIENT_PROXY_METHOD_ERROR] = { &client_demarshal_error, PW_PERM_W, }, [PW_CLIENT_METHOD_ERROR] = { &client_demarshal_error, PW_PERM_W, },
[PW_CLIENT_PROXY_METHOD_UPDATE_PROPERTIES] = { &client_demarshal_update_properties, PW_PERM_W, }, [PW_CLIENT_METHOD_UPDATE_PROPERTIES] = { &client_demarshal_update_properties, PW_PERM_W, },
[PW_CLIENT_PROXY_METHOD_GET_PERMISSIONS] = { &client_demarshal_get_permissions, 0, }, [PW_CLIENT_METHOD_GET_PERMISSIONS] = { &client_demarshal_get_permissions, 0, },
[PW_CLIENT_PROXY_METHOD_UPDATE_PERMISSIONS] = { &client_demarshal_update_permissions, PW_PERM_W, }, [PW_CLIENT_METHOD_UPDATE_PERMISSIONS] = { &client_demarshal_update_permissions, PW_PERM_W, },
}; };
static const struct pw_client_proxy_events pw_protocol_native_client_event_marshal = { static const struct pw_client_events pw_protocol_native_client_event_marshal = {
PW_VERSION_CLIENT_PROXY_EVENTS, PW_VERSION_CLIENT_EVENTS,
.info = &client_marshal_info, .info = &client_marshal_info,
.permissions = &client_marshal_permissions, .permissions = &client_marshal_permissions,
}; };
static const struct pw_protocol_native_demarshal static const struct pw_protocol_native_demarshal
pw_protocol_native_client_event_demarshal[PW_CLIENT_PROXY_EVENT_NUM] = pw_protocol_native_client_event_demarshal[PW_CLIENT_EVENT_NUM] =
{ {
[PW_CLIENT_PROXY_EVENT_INFO] = { &client_demarshal_info, 0, }, [PW_CLIENT_EVENT_INFO] = { &client_demarshal_info, 0, },
[PW_CLIENT_PROXY_EVENT_PERMISSIONS] = { &client_demarshal_permissions, 0, } [PW_CLIENT_EVENT_PERMISSIONS] = { &client_demarshal_permissions, 0, }
}; };
static const struct pw_protocol_marshal pw_protocol_native_client_marshal = { static const struct pw_protocol_marshal pw_protocol_native_client_marshal = {
PW_TYPE_INTERFACE_Client, PW_TYPE_INTERFACE_Client,
PW_VERSION_CLIENT_PROXY, PW_VERSION_CLIENT,
0, 0,
PW_CLIENT_PROXY_METHOD_NUM, PW_CLIENT_METHOD_NUM,
PW_CLIENT_PROXY_EVENT_NUM, PW_CLIENT_EVENT_NUM,
.client_marshal = &pw_protocol_native_client_method_marshal, .client_marshal = &pw_protocol_native_client_method_marshal,
.server_demarshal = pw_protocol_native_client_method_demarshal, .server_demarshal = pw_protocol_native_client_method_demarshal,
.server_marshal = &pw_protocol_native_client_event_marshal, .server_marshal = &pw_protocol_native_client_event_marshal,

10
src/modules/module-protocol-native/v0/interfaces.h
View file

@ -487,12 +487,12 @@ struct pw_factory_proxy_v0_events {
#define PW_VERSION_CLIENT_V0 0 #define PW_VERSION_CLIENT_V0 0
#define PW_CLIENT_PROXY_V0_EVENT_INFO 0 #define PW_CLIENT_V0_EVENT_INFO 0
#define PW_CLIENT_PROXY_V0_EVENT_NUM 1 #define PW_CLIENT_V0_EVENT_NUM 1
/** Client events */ /** Client events */
struct pw_client_proxy_v0_events { struct pw_client_v0_events {
#define PW_VERSION_CLIENT_PROXY_V0_EVENTS 0 #define PW_VERSION_CLIENT_V0_EVENTS 0
uint32_t version; uint32_t version;
/** /**
* Notify client info * Notify client info
@ -502,7 +502,7 @@ struct pw_client_proxy_v0_events {
void (*info) (void *object, struct pw_client_info *info); void (*info) (void *object, struct pw_client_info *info);
}; };
#define pw_client_resource_v0_info(r,...) pw_resource_notify(r,struct pw_client_proxy_v0_events,info,__VA_ARGS__) #define pw_client_resource_v0_info(r,...) pw_resource_notify(r,struct pw_client_v0_events,info,__VA_ARGS__)
#define PW_VERSION_LINK_V0 0 #define PW_VERSION_LINK_V0 0

10
src/modules/module-protocol-native/v0/protocol-native.c
View file

@ -195,7 +195,7 @@ static int core_demarshal_permissions(void *object, const struct pw_protocol_nat
return -EINVAL; return -EINVAL;
} }
/* FIXME */ /* FIXME */
//return pw_resource_notify(resource, struct pw_impl_client_proxy_methods, update_permissions, 0, //return pw_resource_notify(resource, struct pw_impl_client_methods, update_permissions, 0,
// n_permissions, permissions); // n_permissions, permissions);
return 0; return 0;
} }
@ -960,7 +960,7 @@ static void client_marshal_info(void *object, const struct pw_client_info *info)
struct spa_pod_frame f; struct spa_pod_frame f;
uint32_t i, n_items; uint32_t i, n_items;
b = pw_protocol_native_begin_resource(resource, PW_CLIENT_PROXY_V0_EVENT_INFO, NULL); b = pw_protocol_native_begin_resource(resource, PW_CLIENT_V0_EVENT_INFO, NULL);
n_items = info->props ? info->props->n_items : 0; n_items = info->props ? info->props->n_items : 0;
@ -1148,8 +1148,8 @@ static const struct pw_protocol_marshal pw_protocol_native_port_marshal = {
NULL NULL
}; };
static const struct pw_client_proxy_events pw_protocol_native_client_event_marshal = { static const struct pw_client_events pw_protocol_native_client_event_marshal = {
PW_VERSION_CLIENT_PROXY_EVENTS, PW_VERSION_CLIENT_EVENTS,
.info = &client_marshal_info, .info = &client_marshal_info,
.permissions = &client_marshal_permissions, .permissions = &client_marshal_permissions,
}; };
@ -1158,7 +1158,7 @@ static const struct pw_protocol_marshal pw_protocol_native_client_marshal = {
PW_TYPE_INTERFACE_Client, PW_TYPE_INTERFACE_Client,
PW_VERSION_CLIENT_V0, PW_VERSION_CLIENT_V0,
0, 0,
PW_CLIENT_PROXY_EVENT_NUM, PW_CLIENT_EVENT_NUM,
0, 0,
NULL, NULL, NULL, NULL,
&pw_protocol_native_client_event_marshal, &pw_protocol_native_client_event_marshal,

46
src/pipewire/client.h
View file

@ -53,16 +53,16 @@ pw_client_info_update(struct pw_client_info *info,
void pw_client_info_free(struct pw_client_info *info); void pw_client_info_free(struct pw_client_info *info);
#define PW_VERSION_CLIENT_PROXY 3 #define PW_VERSION_CLIENT 3
struct pw_client_proxy; struct pw_client;
#define PW_CLIENT_PROXY_EVENT_INFO 0 #define PW_CLIENT_EVENT_INFO 0
#define PW_CLIENT_PROXY_EVENT_PERMISSIONS 1 #define PW_CLIENT_EVENT_PERMISSIONS 1
#define PW_CLIENT_PROXY_EVENT_NUM 2 #define PW_CLIENT_EVENT_NUM 2
/** Client events */ /** Client events */
struct pw_client_proxy_events { struct pw_client_events {
#define PW_VERSION_CLIENT_PROXY_EVENTS 0 #define PW_VERSION_CLIENT_EVENTS 0
uint32_t version; uint32_t version;
/** /**
* Notify client info * Notify client info
@ -87,21 +87,21 @@ struct pw_client_proxy_events {
}; };
#define PW_CLIENT_PROXY_METHOD_ADD_LISTENER 0 #define PW_CLIENT_METHOD_ADD_LISTENER 0
#define PW_CLIENT_PROXY_METHOD_ERROR 1 #define PW_CLIENT_METHOD_ERROR 1
#define PW_CLIENT_PROXY_METHOD_UPDATE_PROPERTIES 2 #define PW_CLIENT_METHOD_UPDATE_PROPERTIES 2
#define PW_CLIENT_PROXY_METHOD_GET_PERMISSIONS 3 #define PW_CLIENT_METHOD_GET_PERMISSIONS 3
#define PW_CLIENT_PROXY_METHOD_UPDATE_PERMISSIONS 4 #define PW_CLIENT_METHOD_UPDATE_PERMISSIONS 4
#define PW_CLIENT_PROXY_METHOD_NUM 5 #define PW_CLIENT_METHOD_NUM 5
/** Client methods */ /** Client methods */
struct pw_client_proxy_methods { struct pw_client_methods {
#define PW_VERSION_CLIENT_PROXY_METHODS 0 #define PW_VERSION_CLIENT_METHODS 0
uint32_t version; uint32_t version;
int (*add_listener) (void *object, int (*add_listener) (void *object,
struct spa_hook *listener, struct spa_hook *listener,
const struct pw_client_proxy_events *events, const struct pw_client_events *events,
void *data); void *data);
/** /**
* Send an error to a client * Send an error to a client
@ -144,20 +144,20 @@ struct pw_client_proxy_methods {
const struct pw_permission *permissions); const struct pw_permission *permissions);
}; };
#define pw_client_proxy_method(o,method,version,...) \ #define pw_client_method(o,method,version,...) \
({ \ ({ \
int _res = -ENOTSUP; \ int _res = -ENOTSUP; \
spa_interface_call_res((struct spa_interface*)o, \ spa_interface_call_res((struct spa_interface*)o, \
struct pw_client_proxy_methods, _res, \ struct pw_client_methods, _res, \
method, version, ##__VA_ARGS__); \ method, version, ##__VA_ARGS__); \
_res; \ _res; \
}) })
#define pw_client_proxy_add_listener(c,...) pw_client_proxy_method(c,add_listener,0,__VA_ARGS__) #define pw_client_add_listener(c,...) pw_client_method(c,add_listener,0,__VA_ARGS__)
#define pw_client_proxy_error(c,...) pw_client_proxy_method(c,error,0,__VA_ARGS__) #define pw_client_error(c,...) pw_client_method(c,error,0,__VA_ARGS__)
#define pw_client_proxy_update_properties(c,...) pw_client_proxy_method(c,update_properties,0,__VA_ARGS__) #define pw_client_update_properties(c,...) pw_client_method(c,update_properties,0,__VA_ARGS__)
#define pw_client_proxy_get_permissions(c,...) pw_client_proxy_method(c,get_permissions,0,__VA_ARGS__) #define pw_client_get_permissions(c,...) pw_client_method(c,get_permissions,0,__VA_ARGS__)
#define pw_client_proxy_update_permissions(c,...) pw_client_proxy_method(c,update_permissions,0,__VA_ARGS__) #define pw_client_update_permissions(c,...) pw_client_method(c,update_permissions,0,__VA_ARGS__)
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */

2
src/pipewire/context.c
View file

@ -185,7 +185,7 @@ static int core_hello(void *object, uint32_t version)
if (version >= 3) { if (version >= 3) {
if ((res = pw_global_bind(client->global, client, if ((res = pw_global_bind(client->global, client,
PW_PERM_RWX, PW_VERSION_CLIENT_PROXY, 1)) < 0) PW_PERM_RWX, PW_VERSION_CLIENT, 1)) < 0)
return res; return res;
} }
return 0; return 0;

18
src/pipewire/core.c
View file

@ -152,8 +152,8 @@ int pw_core_update_properties(struct pw_core *core, const struct spa_dict *dict)
if (!changed) if (!changed)
return 0; return 0;
if (core->client_proxy) if (core->client)
pw_client_proxy_update_properties(core->client_proxy, &core->properties->dict); pw_client_update_properties(core->client, &core->properties->dict);
return changed; return changed;
} }
@ -199,7 +199,7 @@ static void proxy_core_destroy(void *data)
pw_filter_disconnect(filter); pw_filter_disconnect(filter);
pw_protocol_client_disconnect(core->conn); pw_protocol_client_disconnect(core->conn);
core->client_proxy = NULL; core->client = NULL;
pw_map_for_each(&core->objects, destroy_proxy, core); pw_map_for_each(&core->objects, destroy_proxy, core);
pw_map_reset(&core->objects); pw_map_reset(&core->objects);
@ -225,9 +225,9 @@ static const struct pw_proxy_events proxy_core_events = {
}; };
SPA_EXPORT SPA_EXPORT
struct pw_client_proxy * pw_core_get_client_proxy(struct pw_core *core) struct pw_client * pw_core_get_client(struct pw_core *core)
{ {
return core->client_proxy; return core->client;
} }
SPA_EXPORT SPA_EXPORT
@ -329,9 +329,9 @@ static struct pw_core *core_new(struct pw_context *context,
if ((res = pw_proxy_init(&p->proxy, PW_TYPE_INTERFACE_Core, PW_VERSION_CORE)) < 0) if ((res = pw_proxy_init(&p->proxy, PW_TYPE_INTERFACE_Core, PW_VERSION_CORE)) < 0)
goto error_proxy; goto error_proxy;
p->client_proxy = (struct pw_client_proxy*)pw_proxy_new(&p->proxy, p->client = (struct pw_client*)pw_proxy_new(&p->proxy,
PW_TYPE_INTERFACE_Client, PW_VERSION_CLIENT_PROXY, 0); PW_TYPE_INTERFACE_Client, PW_VERSION_CLIENT, 0);
if (p->client_proxy == NULL) { if (p->client == NULL) {
res = -errno; res = -errno;
goto error_proxy; goto error_proxy;
} }
@ -340,7 +340,7 @@ static struct pw_core *core_new(struct pw_context *context,
pw_proxy_add_listener(&p->proxy, &p->proxy_core_listener, &proxy_core_events, p); pw_proxy_add_listener(&p->proxy, &p->proxy_core_listener, &proxy_core_events, p);
pw_core_hello(p, PW_VERSION_CORE); pw_core_hello(p, PW_VERSION_CORE);
pw_client_proxy_update_properties(p->client_proxy, &p->properties->dict); pw_client_update_properties(p->client, &p->properties->dict);
spa_list_append(&context->core_list, &p->link); spa_list_append(&context->core_list, &p->link);

2
src/pipewire/core.h
View file

@ -529,7 +529,7 @@ int pw_core_disconnect(struct pw_core *core);
void *pw_core_get_user_data(struct pw_core *core); void *pw_core_get_user_data(struct pw_core *core);
/** Get the client proxy */ /** Get the client proxy */
struct pw_client_proxy * pw_core_get_client_proxy(struct pw_core *core); struct pw_client * pw_core_get_client(struct pw_core *core);
/** Get the context object used to created this core */ /** Get the context object used to created this core */
struct pw_context * pw_core_get_context(struct pw_core *core); struct pw_context * pw_core_get_context(struct pw_core *core);

8
src/pipewire/impl-client.c
View file

@ -38,7 +38,7 @@ struct impl {
struct spa_hook pool_listener; struct spa_hook pool_listener;
}; };
#define pw_client_resource(r,m,v,...) pw_resource_call(r,struct pw_client_proxy_events,m,v,__VA_ARGS__) #define pw_client_resource(r,m,v,...) pw_resource_call(r,struct pw_client_events,m,v,__VA_ARGS__)
#define pw_client_resource_info(r,...) pw_client_resource(r,info,0,__VA_ARGS__) #define pw_client_resource_info(r,...) pw_client_resource(r,info,0,__VA_ARGS__)
#define pw_client_resource_permissions(r,...) pw_client_resource(r,permissions,0,__VA_ARGS__) #define pw_client_resource_permissions(r,...) pw_client_resource(r,permissions,0,__VA_ARGS__)
@ -162,8 +162,8 @@ static int client_update_permissions(void *object,
return pw_impl_client_update_permissions(client, n_permissions, permissions); return pw_impl_client_update_permissions(client, n_permissions, permissions);
} }
static const struct pw_client_proxy_methods client_methods = { static const struct pw_client_methods client_methods = {
PW_VERSION_CLIENT_PROXY_METHODS, PW_VERSION_CLIENT_METHODS,
.error = client_error, .error = client_error,
.update_properties = client_update_properties, .update_properties = client_update_properties,
.get_permissions = client_get_permissions, .get_permissions = client_get_permissions,
@ -395,7 +395,7 @@ int pw_impl_client_register(struct pw_impl_client *client,
client->global = pw_global_new(context, client->global = pw_global_new(context,
PW_TYPE_INTERFACE_Client, PW_TYPE_INTERFACE_Client,
PW_VERSION_CLIENT_PROXY, PW_VERSION_CLIENT,
properties, properties,
global_bind, global_bind,
client); client);

2
src/pipewire/private.h
View file

@ -739,7 +739,7 @@ struct pw_core {
struct pw_map objects; /**< map of client side proxy objects struct pw_map objects; /**< map of client side proxy objects
* indexed with the client id */ * indexed with the client id */
struct pw_client_proxy *client_proxy; /**< proxy for the client object */ struct pw_client *client; /**< proxy for the client object */
struct spa_list stream_list; /**< list of \ref pw_stream objects */ struct spa_list stream_list; /**< list of \ref pw_stream objects */
struct spa_list filter_list; /**< list of \ref pw_stream objects */ struct spa_list filter_list; /**< list of \ref pw_stream objects */

14
src/tests/test-interfaces.c
View file

@ -297,26 +297,26 @@ static void test_factory_abi(void)
static void test_client_abi(void) static void test_client_abi(void)
{ {
struct pw_client_proxy_methods m; struct pw_client_methods m;
struct pw_client_proxy_events e; struct pw_client_events e;
struct { struct {
uint32_t version; uint32_t version;
int (*add_listener) (void *object, int (*add_listener) (void *object,
struct spa_hook *listener, struct spa_hook *listener,
const struct pw_client_proxy_events *events, const struct pw_client_events *events,
void *data); void *data);
int (*error) (void *object, uint32_t id, int res, const char *error); int (*error) (void *object, uint32_t id, int res, const char *error);
int (*update_properties) (void *object, const struct spa_dict *props); int (*update_properties) (void *object, const struct spa_dict *props);
int (*get_permissions) (void *object, uint32_t index, uint32_t num); int (*get_permissions) (void *object, uint32_t index, uint32_t num);
int (*update_permissions) (void *object, uint32_t n_permissions, int (*update_permissions) (void *object, uint32_t n_permissions,
const struct pw_permission *permissions); const struct pw_permission *permissions);
} methods = { PW_VERSION_CLIENT_PROXY_METHODS, }; } methods = { PW_VERSION_CLIENT_METHODS, };
struct { struct {
uint32_t version; uint32_t version;
void (*info) (void *object, const struct pw_client_info *info); void (*info) (void *object, const struct pw_client_info *info);
void (*permissions) (void *object, uint32_t index, void (*permissions) (void *object, uint32_t index,
uint32_t n_permissions, const struct pw_permission *permissions); uint32_t n_permissions, const struct pw_permission *permissions);
} events = { PW_VERSION_CLIENT_PROXY_EVENTS, }; } events = { PW_VERSION_CLIENT_EVENTS, };
TEST_FUNC(m, methods, version); TEST_FUNC(m, methods, version);
TEST_FUNC(m, methods, add_listener); TEST_FUNC(m, methods, add_listener);
@ -324,13 +324,13 @@ static void test_client_abi(void)
TEST_FUNC(m, methods, update_properties); TEST_FUNC(m, methods, update_properties);
TEST_FUNC(m, methods, get_permissions); TEST_FUNC(m, methods, get_permissions);
TEST_FUNC(m, methods, update_permissions); TEST_FUNC(m, methods, update_permissions);
spa_assert(PW_VERSION_CLIENT_PROXY_METHODS == 0); spa_assert(PW_VERSION_CLIENT_METHODS == 0);
spa_assert(sizeof(m) == sizeof(methods)); spa_assert(sizeof(m) == sizeof(methods));
TEST_FUNC(e, events, version); TEST_FUNC(e, events, version);
TEST_FUNC(e, events, info); TEST_FUNC(e, events, info);
TEST_FUNC(e, events, permissions); TEST_FUNC(e, events, permissions);
spa_assert(PW_VERSION_CLIENT_PROXY_EVENTS == 0); spa_assert(PW_VERSION_CLIENT_EVENTS == 0);
spa_assert(sizeof(e) == sizeof(events)); spa_assert(sizeof(e) == sizeof(events));
} }

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

@ -850,8 +850,8 @@ static void client_event_permissions(void *object, uint32_t index,
} }
} }
static const struct pw_client_proxy_events client_events = { static const struct pw_client_events client_events = {
PW_VERSION_CLIENT_PROXY_EVENTS, PW_VERSION_CLIENT_EVENTS,
.info = client_event_info, .info = client_event_info,
.permissions = client_event_permissions .permissions = client_event_permissions
}; };
@ -1128,7 +1128,7 @@ static bool bind_global(struct remote_data *rd, struct global *global, char **er
break; break;
case PW_TYPE_INTERFACE_Client: case PW_TYPE_INTERFACE_Client:
events = &client_events; events = &client_events;
client_version = PW_VERSION_CLIENT_PROXY; client_version = PW_VERSION_CLIENT;
destroy = (pw_destroy_t) pw_client_info_free; destroy = (pw_destroy_t) pw_client_info_free;
info_func = info_client; info_func = info_client;
break; break;
@ -1511,7 +1511,7 @@ static bool do_permissions(struct data *data, const char *cmd, char *args, char
permissions[0] = PW_PERMISSION_INIT(atoi(a[1]), atoi(a[2])); permissions[0] = PW_PERMISSION_INIT(atoi(a[1]), atoi(a[2]));
pw_client_proxy_update_permissions((struct pw_client_proxy*)global->proxy, pw_client_update_permissions((struct pw_client*)global->proxy,
1, permissions); 1, permissions);
return true; return true;
@ -1545,7 +1545,7 @@ static bool do_get_permissions(struct data *data, const char *cmd, char *args, c
if (!bind_global(rd, global, error)) if (!bind_global(rd, global, error))
return false; return false;
} }
pw_client_proxy_get_permissions((struct pw_client_proxy*)global->proxy, pw_client_get_permissions((struct pw_client*)global->proxy,
0, UINT32_MAX); 0, UINT32_MAX);
return true; return true;

6
src/tools/pipewire-dot.c
View file

@ -541,8 +541,8 @@ static void client_event_info(void *data, const struct pw_client_info *info)
global_event_info(data, info); global_event_info(data, info);
} }
static const struct pw_client_proxy_events client_events = { static const struct pw_client_events client_events = {
PW_VERSION_CLIENT_PROXY_EVENTS, PW_VERSION_CLIENT_EVENTS,
.info = client_event_info .info = client_event_info
}; };
@ -636,7 +636,7 @@ static void registry_event_global(void *data, uint32_t id, uint32_t permissions,
info_destroy = (pw_destroy_t)pw_client_info_free; info_destroy = (pw_destroy_t)pw_client_info_free;
info_update = (info_update_t)pw_client_info_update; info_update = (info_update_t)pw_client_info_update;
draw = draw_client; draw = draw_client;
client_version = PW_VERSION_CLIENT_PROXY; client_version = PW_VERSION_CLIENT;
break; break;
case PW_TYPE_INTERFACE_Device: case PW_TYPE_INTERFACE_Device:
events = &device_events; events = &device_events;

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

@ -427,8 +427,8 @@ static void client_event_info(void *object, const struct pw_client_info *info)
} }
} }
static const struct pw_client_proxy_events client_events = { static const struct pw_client_events client_events = {
PW_VERSION_CLIENT_PROXY_EVENTS, PW_VERSION_CLIENT_EVENTS,
.info = client_event_info .info = client_event_info
}; };
@ -606,7 +606,7 @@ static void registry_event_global(void *data, uint32_t id,
break; break;
case PW_TYPE_INTERFACE_Client: case PW_TYPE_INTERFACE_Client:
events = &client_events; events = &client_events;
client_version = PW_VERSION_CLIENT_PROXY; client_version = PW_VERSION_CLIENT;
destroy = (pw_destroy_t) pw_client_info_free; destroy = (pw_destroy_t) pw_client_info_free;
break; break;
case PW_TYPE_INTERFACE_Link: case PW_TYPE_INTERFACE_Link: