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

pw_endpoint_proxy -> pw_endpoint

Browse source
This commit is contained in:
Wim Taymans 2019-12-11 16:43:53 +01:00
parent 85103d128e
commit 9b53c65c72
10 changed files with 71 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/module-session-manager/endpoint.c
View file

@ -47,7 +47,7 @@ struct resource_data {
};
#define pw_endpoint_resource(r,m,v,...) \
pw_resource_call(r,struct pw_endpoint_proxy_events,m,v,__VA_ARGS__)
pw_resource_call(r,struct pw_endpoint_events,m,v,__VA_ARGS__)
#define pw_endpoint_resource_info(r,...) \
pw_endpoint_resource(r,info,0,__VA_ARGS__)
#define pw_endpoint_resource_param(r,...) \
@ -139,8 +139,8 @@ static int endpoint_create_link(void *object, const struct spa_dict *props)
return 0;
}
static const struct pw_endpoint_proxy_methods methods = {
PW_VERSION_ENDPOINT_PROXY_METHODS,
static const struct pw_endpoint_methods methods = {
PW_VERSION_ENDPOINT_METHODS,
.subscribe_params = endpoint_subscribe_params,
.enum_params = endpoint_enum_params,
.set_param = endpoint_set_param,
@ -328,7 +328,7 @@ int endpoint_init(struct endpoint *this,
this->global = pw_global_new (context,
PW_TYPE_INTERFACE_Endpoint,
PW_VERSION_ENDPOINT_PROXY,
PW_VERSION_ENDPOINT,
properties, endpoint_bind, this);
if (!this->global)
goto no_mem;

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

@ -1490,7 +1490,7 @@ static void endpoint_marshal_info (void *object,
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource,
PW_ENDPOINT_PROXY_EVENT_INFO, NULL);
PW_ENDPOINT_EVENT_INFO, NULL);
marshal_pw_endpoint_info(b, info);
@ -1505,7 +1505,7 @@ static void endpoint_marshal_param (void *object, int seq, uint32_t id,
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource,
PW_ENDPOINT_PROXY_EVENT_PARAM, NULL);
PW_ENDPOINT_EVENT_PARAM, NULL);
spa_pod_builder_add_struct(b,
SPA_POD_Int(seq),
@ -1519,7 +1519,7 @@ static void endpoint_marshal_param (void *object, int seq, uint32_t id,
static int endpoint_marshal_add_listener(void *object,
struct spa_hook *listener,
const struct pw_endpoint_proxy_events *events,
const struct pw_endpoint_events *events,
void *data)
{
struct pw_proxy *proxy = object;
@ -1534,7 +1534,7 @@ static int endpoint_marshal_subscribe_params(void *object,
struct spa_pod_builder *b;
b = pw_protocol_native_begin_proxy(proxy,
PW_ENDPOINT_PROXY_METHOD_SUBSCRIBE_PARAMS, NULL);
PW_ENDPOINT_METHOD_SUBSCRIBE_PARAMS, NULL);
spa_pod_builder_add_struct(b,
SPA_POD_Array(sizeof(uint32_t), SPA_TYPE_Id, n_ids, ids));
@ -1552,7 +1552,7 @@ static int endpoint_marshal_enum_params(void *object,
struct spa_pod_builder *b;
b = pw_protocol_native_begin_proxy(proxy,
PW_ENDPOINT_PROXY_METHOD_ENUM_PARAMS, &msg);
PW_ENDPOINT_METHOD_ENUM_PARAMS, &msg);
spa_pod_builder_add_struct(b,
SPA_POD_Int(SPA_RESULT_RETURN_ASYNC(msg->seq)),
@ -1572,7 +1572,7 @@ static int endpoint_marshal_set_param(void *object,
struct spa_pod_builder *b;
b = pw_protocol_native_begin_proxy(proxy,
PW_ENDPOINT_PROXY_METHOD_SET_PARAM, NULL);
PW_ENDPOINT_METHOD_SET_PARAM, NULL);
spa_pod_builder_add_struct(b,
SPA_POD_Id(id),
@ -1589,7 +1589,7 @@ static int endpoint_marshal_create_link(void *object,
struct spa_pod_builder *b;
b = pw_protocol_native_begin_proxy(proxy,
PW_ENDPOINT_PROXY_METHOD_CREATE_LINK, NULL);
PW_ENDPOINT_METHOD_CREATE_LINK, NULL);
push_dict(b, props);
@ -1609,7 +1609,7 @@ static int endpoint_demarshal_info(void *object,
demarshal_pw_endpoint_info(&prs, &f, &info);
return pw_proxy_notify(proxy, struct pw_endpoint_proxy_events,
return pw_proxy_notify(proxy, struct pw_endpoint_events,
info, 0, &info);
}
@ -1631,7 +1631,7 @@ static int endpoint_demarshal_param(void *object,
SPA_POD_Pod(&param)) < 0)
return -EINVAL;
return pw_proxy_notify(proxy, struct pw_endpoint_proxy_events,
return pw_proxy_notify(proxy, struct pw_endpoint_events,
param, 0, seq, id, index, next, param);
}
@ -1651,7 +1651,7 @@ static int endpoint_demarshal_subscribe_params(void *object,
if (ctype != SPA_TYPE_Id)
return -EINVAL;
return pw_resource_notify(resource, struct pw_endpoint_proxy_methods,
return pw_resource_notify(resource, struct pw_endpoint_methods,
subscribe_params, 0, ids, n_ids);
}
@ -1673,7 +1673,7 @@ static int endpoint_demarshal_enum_params(void *object,
SPA_POD_Pod(&filter)) < 0)
return -EINVAL;
return pw_resource_notify(resource, struct pw_endpoint_proxy_methods,
return pw_resource_notify(resource, struct pw_endpoint_methods,
enum_params, 0, seq, id, index, num, filter);
}
@ -1692,7 +1692,7 @@ static int endpoint_demarshal_set_param(void *object,
SPA_POD_Pod(&param)) < 0)
return -EINVAL;
return pw_resource_notify(resource, struct pw_endpoint_proxy_methods,
return pw_resource_notify(resource, struct pw_endpoint_methods,
set_param, 0, id, flags, param);
}
@ -1708,25 +1708,25 @@ static int endpoint_demarshal_create_link(void *object,
parse_dict(&prs, &f, &props);
return pw_resource_notify(resource, struct pw_endpoint_proxy_methods,
return pw_resource_notify(resource, struct pw_endpoint_methods,
create_link, 0, &props);
}
static const struct pw_endpoint_proxy_events pw_protocol_native_endpoint_event_marshal = {
PW_VERSION_ENDPOINT_PROXY_EVENTS,
static const struct pw_endpoint_events pw_protocol_native_endpoint_event_marshal = {
PW_VERSION_ENDPOINT_EVENTS,
.info = endpoint_marshal_info,
.param = endpoint_marshal_param,
};
static const struct pw_protocol_native_demarshal
pw_protocol_native_endpoint_event_demarshal[PW_ENDPOINT_PROXY_EVENT_NUM] =
pw_protocol_native_endpoint_event_demarshal[PW_ENDPOINT_EVENT_NUM] =
{
[PW_ENDPOINT_PROXY_EVENT_INFO] = { endpoint_demarshal_info, 0 },
[PW_ENDPOINT_PROXY_EVENT_PARAM] = { endpoint_demarshal_param, 0 },
[PW_ENDPOINT_EVENT_INFO] = { endpoint_demarshal_info, 0 },
[PW_ENDPOINT_EVENT_PARAM] = { endpoint_demarshal_param, 0 },
};
static const struct pw_endpoint_proxy_methods pw_protocol_native_endpoint_method_marshal = {
PW_VERSION_ENDPOINT_PROXY_METHODS,
static const struct pw_endpoint_methods pw_protocol_native_endpoint_method_marshal = {
PW_VERSION_ENDPOINT_METHODS,
.add_listener = endpoint_marshal_add_listener,
.subscribe_params = endpoint_marshal_subscribe_params,
.enum_params = endpoint_marshal_enum_params,
@ -1735,21 +1735,21 @@ static const struct pw_endpoint_proxy_methods pw_protocol_native_endpoint_method
};
static const struct pw_protocol_native_demarshal
pw_protocol_native_endpoint_method_demarshal[PW_ENDPOINT_PROXY_METHOD_NUM] =
pw_protocol_native_endpoint_method_demarshal[PW_ENDPOINT_METHOD_NUM] =
{
[PW_ENDPOINT_PROXY_METHOD_ADD_LISTENER] = { NULL, 0 },
[PW_ENDPOINT_PROXY_METHOD_SUBSCRIBE_PARAMS] = { endpoint_demarshal_subscribe_params, 0 },
[PW_ENDPOINT_PROXY_METHOD_ENUM_PARAMS] = { endpoint_demarshal_enum_params, 0 },
[PW_ENDPOINT_PROXY_METHOD_SET_PARAM] = { endpoint_demarshal_set_param, PW_PERM_W },
[PW_ENDPOINT_PROXY_METHOD_CREATE_LINK] = { endpoint_demarshal_create_link, PW_PERM_X },
[PW_ENDPOINT_METHOD_ADD_LISTENER] = { NULL, 0 },
[PW_ENDPOINT_METHOD_SUBSCRIBE_PARAMS] = { endpoint_demarshal_subscribe_params, 0 },
[PW_ENDPOINT_METHOD_ENUM_PARAMS] = { endpoint_demarshal_enum_params, 0 },
[PW_ENDPOINT_METHOD_SET_PARAM] = { endpoint_demarshal_set_param, PW_PERM_W },
[PW_ENDPOINT_METHOD_CREATE_LINK] = { endpoint_demarshal_create_link, PW_PERM_X },
};
static const struct pw_protocol_marshal pw_protocol_native_endpoint_marshal = {
PW_TYPE_INTERFACE_Endpoint,
PW_VERSION_ENDPOINT_PROXY,
PW_VERSION_ENDPOINT,
0,
PW_ENDPOINT_PROXY_METHOD_NUM,
PW_ENDPOINT_PROXY_EVENT_NUM,
PW_ENDPOINT_METHOD_NUM,
PW_ENDPOINT_EVENT_NUM,
&pw_protocol_native_endpoint_method_marshal,
&pw_protocol_native_endpoint_method_demarshal,
&pw_protocol_native_endpoint_event_marshal,