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

pw_node_proxy -> pw_node

Browse source
This commit is contained in:
Wim Taymans 2019-12-11 15:26:11 +01:00
parent 199fa47216
commit beb3c69dfe
23 changed files with 126 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/module-adapter.c
View file

@ -113,7 +113,7 @@ static void node_initialized(void *data)
global = pw_impl_node_get_global(nd->adapter);
res = pw_global_bind(global, client,
PW_PERM_RWX, PW_VERSION_NODE_PROXY, nd->new_id);
PW_PERM_RWX, PW_VERSION_NODE, nd->new_id);
if (res < 0)
goto error_bind;
@ -290,7 +290,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
factory = pw_impl_factory_new(context,
"adapter",
PW_TYPE_INTERFACE_Node,
PW_VERSION_NODE_PROXY,
PW_VERSION_NODE,
pw_properties_new(
PW_KEY_FACTORY_USAGE, FACTORY_USAGE,
NULL),

2
src/modules/module-client-node/remote-node.c
View file

@ -1157,7 +1157,7 @@ static struct pw_proxy *node_export(struct pw_core *core, void *object, bool do_
do_node_init(client_node);
data->proxy = (struct pw_proxy*) pw_client_node_proxy_get_node(data->client_node,
PW_VERSION_NODE_PROXY, user_data_size);
PW_VERSION_NODE, user_data_size);
pw_proxy_add_listener(data->proxy, &data->proxy_listener, &proxy_events, data);

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

@ -1041,7 +1041,7 @@ static int factory_demarshal_info(void *object, const struct pw_protocol_native_
static int node_method_marshal_add_listener(void *object,
struct spa_hook *listener,
const struct pw_node_proxy_events *events,
const struct pw_node_events *events,
void *data)
{
struct pw_proxy *proxy = object;
@ -1055,7 +1055,7 @@ static void node_marshal_info(void *object, const struct pw_node_info *info)
struct spa_pod_builder *b;
struct spa_pod_frame f;
b = pw_protocol_native_begin_resource(resource, PW_NODE_PROXY_EVENT_INFO, NULL);
b = pw_protocol_native_begin_resource(resource, PW_NODE_EVENT_INFO, NULL);
spa_pod_builder_push_struct(b, &f);
spa_pod_builder_add(b,
@ -1122,7 +1122,7 @@ static int node_demarshal_info(void *object, const struct pw_protocol_native_mes
return -EINVAL;
}
return pw_proxy_notify(proxy, struct pw_node_proxy_events, info, 0, &info);
return pw_proxy_notify(proxy, struct pw_node_events, info, 0, &info);
}
static void node_marshal_param(void *object, int seq, uint32_t id,
@ -1131,7 +1131,7 @@ static void node_marshal_param(void *object, int seq, uint32_t id,
struct pw_resource *resource = object;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource, PW_NODE_PROXY_EVENT_PARAM, NULL);
b = pw_protocol_native_begin_resource(resource, PW_NODE_EVENT_PARAM, NULL);
spa_pod_builder_add_struct(b,
SPA_POD_Int(seq),
@ -1160,7 +1160,7 @@ static int node_demarshal_param(void *object, const struct pw_protocol_native_me
SPA_POD_Pod(&param)) < 0)
return -EINVAL;
return pw_proxy_notify(proxy, struct pw_node_proxy_events, param, 0,
return pw_proxy_notify(proxy, struct pw_node_events, param, 0,
seq, id, index, next, param);
}
@ -1169,7 +1169,7 @@ static int node_marshal_subscribe_params(void *object, uint32_t *ids, uint32_t n
struct pw_proxy *proxy = object;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_proxy(proxy, PW_NODE_PROXY_METHOD_SUBSCRIBE_PARAMS, NULL);
b = pw_protocol_native_begin_proxy(proxy, PW_NODE_METHOD_SUBSCRIBE_PARAMS, NULL);
spa_pod_builder_add_struct(b,
SPA_POD_Array(sizeof(uint32_t), SPA_TYPE_Id, n_ids, ids));
@ -1192,7 +1192,7 @@ static int node_demarshal_subscribe_params(void *object, const struct pw_protoco
if (ctype != SPA_TYPE_Id)
return -EINVAL;
return pw_resource_notify(resource, struct pw_node_proxy_methods, subscribe_params, 0,
return pw_resource_notify(resource, struct pw_node_methods, subscribe_params, 0,
ids, n_ids);
}
@ -1203,7 +1203,7 @@ static int node_marshal_enum_params(void *object, int seq, uint32_t id,
struct pw_proxy *proxy = object;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_proxy(proxy, PW_NODE_PROXY_METHOD_ENUM_PARAMS, &msg);
b = pw_protocol_native_begin_proxy(proxy, PW_NODE_METHOD_ENUM_PARAMS, &msg);
spa_pod_builder_add_struct(b,
SPA_POD_Int(SPA_RESULT_RETURN_ASYNC(msg->seq)),
@ -1232,7 +1232,7 @@ static int node_demarshal_enum_params(void *object, const struct pw_protocol_nat
SPA_POD_Pod(&filter)) < 0)
return -EINVAL;
return pw_resource_notify(resource, struct pw_node_proxy_methods, enum_params, 0,
return pw_resource_notify(resource, struct pw_node_methods, enum_params, 0,
seq, id, index, num, filter);
}
@ -1242,7 +1242,7 @@ static int node_marshal_set_param(void *object, uint32_t id, uint32_t flags,
struct pw_proxy *proxy = object;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_proxy(proxy, PW_NODE_PROXY_METHOD_SET_PARAM, NULL);
b = pw_protocol_native_begin_proxy(proxy, PW_NODE_METHOD_SET_PARAM, NULL);
spa_pod_builder_add_struct(b,
SPA_POD_Id(id),
@ -1265,7 +1265,7 @@ static int node_demarshal_set_param(void *object, const struct pw_protocol_nativ
SPA_POD_Pod(&param)) < 0)
return -EINVAL;
return pw_resource_notify(resource, struct pw_node_proxy_methods, set_param, 0, id, flags, param);
return pw_resource_notify(resource, struct pw_node_methods, set_param, 0, id, flags, param);
}
static int node_marshal_send_command(void *object, const struct spa_command *command)
@ -1273,7 +1273,7 @@ static int node_marshal_send_command(void *object, const struct spa_command *com
struct pw_proxy *proxy = object;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_proxy(proxy, PW_NODE_PROXY_METHOD_SEND_COMMAND, NULL);
b = pw_protocol_native_begin_proxy(proxy, PW_NODE_METHOD_SEND_COMMAND, NULL);
spa_pod_builder_add_struct(b,
SPA_POD_Pod(command));
return pw_protocol_native_end_proxy(proxy, b);
@ -1290,7 +1290,7 @@ static int node_demarshal_send_command(void *object, const struct pw_protocol_na
SPA_POD_Pod(&command)) < 0)
return -EINVAL;
return pw_resource_notify(resource, struct pw_node_proxy_methods, send_command, 0, command);
return pw_resource_notify(resource, struct pw_node_methods, send_command, 0, command);
}
static int port_method_marshal_add_listener(void *object,
@ -2100,8 +2100,8 @@ static const struct pw_protocol_marshal pw_protocol_native_device_marshal = {
.client_demarshal = pw_protocol_native_device_event_demarshal,
};
static const struct pw_node_proxy_methods pw_protocol_native_node_method_marshal = {
PW_VERSION_NODE_PROXY_METHODS,
static const struct pw_node_methods pw_protocol_native_node_method_marshal = {
PW_VERSION_NODE_METHODS,
.add_listener = &node_method_marshal_add_listener,
.subscribe_params = &node_marshal_subscribe_params,
.enum_params = &node_marshal_enum_params,
@ -2110,33 +2110,33 @@ static const struct pw_node_proxy_methods pw_protocol_native_node_method_marshal
};
static const struct pw_protocol_native_demarshal
pw_protocol_native_node_method_demarshal[PW_NODE_PROXY_METHOD_NUM] =
pw_protocol_native_node_method_demarshal[PW_NODE_METHOD_NUM] =
{
[PW_NODE_PROXY_METHOD_ADD_LISTENER] = { NULL, 0, },
[PW_NODE_PROXY_METHOD_SUBSCRIBE_PARAMS] = { &node_demarshal_subscribe_params, 0, },
[PW_NODE_PROXY_METHOD_ENUM_PARAMS] = { &node_demarshal_enum_params, 0, },
[PW_NODE_PROXY_METHOD_SET_PARAM] = { &node_demarshal_set_param, PW_PERM_W, },
[PW_NODE_PROXY_METHOD_SEND_COMMAND] = { &node_demarshal_send_command, PW_PERM_W, },
[PW_NODE_METHOD_ADD_LISTENER] = { NULL, 0, },
[PW_NODE_METHOD_SUBSCRIBE_PARAMS] = { &node_demarshal_subscribe_params, 0, },
[PW_NODE_METHOD_ENUM_PARAMS] = { &node_demarshal_enum_params, 0, },
[PW_NODE_METHOD_SET_PARAM] = { &node_demarshal_set_param, PW_PERM_W, },
[PW_NODE_METHOD_SEND_COMMAND] = { &node_demarshal_send_command, PW_PERM_W, },
};
static const struct pw_node_proxy_events pw_protocol_native_node_event_marshal = {
PW_VERSION_NODE_PROXY_EVENTS,
static const struct pw_node_events pw_protocol_native_node_event_marshal = {
PW_VERSION_NODE_EVENTS,
.info = &node_marshal_info,
.param = &node_marshal_param,
};
static const struct pw_protocol_native_demarshal
pw_protocol_native_node_event_demarshal[PW_NODE_PROXY_EVENT_NUM] = {
[PW_NODE_PROXY_EVENT_INFO] = { &node_demarshal_info, 0, },
[PW_NODE_PROXY_EVENT_PARAM] = { &node_demarshal_param, 0, }
pw_protocol_native_node_event_demarshal[PW_NODE_EVENT_NUM] = {
[PW_NODE_EVENT_INFO] = { &node_demarshal_info, 0, },
[PW_NODE_EVENT_PARAM] = { &node_demarshal_param, 0, }
};
static const struct pw_protocol_marshal pw_protocol_native_node_marshal = {
PW_TYPE_INTERFACE_Node,
PW_VERSION_NODE_PROXY,
PW_VERSION_NODE,
0,
PW_NODE_PROXY_METHOD_NUM,
PW_NODE_PROXY_EVENT_NUM,
PW_NODE_METHOD_NUM,
PW_NODE_EVENT_NUM,
.client_marshal = &pw_protocol_native_node_method_marshal,
.server_demarshal = pw_protocol_native_node_method_demarshal,
.server_marshal = &pw_protocol_native_node_event_marshal,

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

@ -356,13 +356,13 @@ struct pw_module_v0_events {
#define PW_VERSION_NODE_V0 0
#define PW_NODE_PROXY_V0_EVENT_INFO 0
#define PW_NODE_PROXY_V0_EVENT_PARAM 1
#define PW_NODE_PROXY_V0_EVENT_NUM 2
#define PW_NODE_V0_EVENT_INFO 0
#define PW_NODE_V0_EVENT_PARAM 1
#define PW_NODE_V0_EVENT_NUM 2
/** Node events */
struct pw_node_proxy_v0_events {
#define PW_VERSION_NODE_PROXY_V0_EVENTS 0
struct pw_node_v0_events {
#define PW_VERSION_NODE_V0_EVENTS 0
uint32_t version;
/**
* Notify node info
@ -385,15 +385,15 @@ struct pw_node_proxy_v0_events {
const struct spa_pod *param);
};
#define pw_node_resource_v0_info(r,...) pw_resource_notify(r,struct pw_node_proxy_v0_events,info,__VA_ARGS__)
#define pw_node_resource_v0_param(r,...) pw_resource_notify(r,struct pw_node_proxy_v0_events,param,__VA_ARGS__)
#define pw_node_resource_v0_info(r,...) pw_resource_notify(r,struct pw_node_v0_events,info,__VA_ARGS__)
#define pw_node_resource_v0_param(r,...) pw_resource_notify(r,struct pw_node_v0_events,param,__VA_ARGS__)
#define PW_NODE_PROXY_V0_METHOD_ENUM_PARAMS 0
#define PW_NODE_PROXY_V0_METHOD_NUM 1
#define PW_NODE_V0_METHOD_ENUM_PARAMS 0
#define PW_NODE_V0_METHOD_NUM 1
/** Node methods */
struct pw_node_proxy_v0_methods {
#define PW_VERSION_NODE_PROXY_V0_METHODS 0
struct pw_node_v0_methods {
#define PW_VERSION_NODE_V0_METHODS 0
uint32_t version;
/**
* Enumerate node parameters

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

@ -823,7 +823,7 @@ static void node_marshal_info(void *object, const struct pw_node_info *info)
struct spa_pod_frame f;
uint32_t i, n_items;
b = pw_protocol_native_begin_resource(resource, PW_NODE_PROXY_V0_EVENT_INFO, NULL);
b = pw_protocol_native_begin_resource(resource, PW_NODE_V0_EVENT_INFO, NULL);
n_items = info->props ? info->props->n_items : 0;
@ -856,7 +856,7 @@ static void node_marshal_param(void *object, int seq, uint32_t id, uint32_t inde
struct pw_resource *resource = object;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource, PW_NODE_PROXY_V0_EVENT_PARAM, NULL);
b = pw_protocol_native_begin_resource(resource, PW_NODE_V0_EVENT_PARAM, NULL);
spa_pod_builder_add_struct(b, "I", id, "i", index, "i", next, "P", param);
@ -882,7 +882,7 @@ static int node_demarshal_enum_params(void *object, const struct pw_protocol_nat
id = pw_protocol_native0_type_from_v2(client, id);
filter = NULL;
return pw_resource_notify(resource, struct pw_node_proxy_methods, enum_params, 0,
return pw_resource_notify(resource, struct pw_node_methods, enum_params, 0,
0, id, index, num, filter);
}
@ -1104,11 +1104,11 @@ static const struct pw_protocol_marshal pw_protocol_native_factory_marshal = {
};
static const struct pw_protocol_native_demarshal pw_protocol_native_node_method_demarshal[] = {
[PW_NODE_PROXY_V0_METHOD_ENUM_PARAMS] = { &node_demarshal_enum_params, 0, PW_PROTOCOL_NATIVE_FLAG_REMAP, },
[PW_NODE_V0_METHOD_ENUM_PARAMS] = { &node_demarshal_enum_params, 0, PW_PROTOCOL_NATIVE_FLAG_REMAP, },
};
static const struct pw_node_proxy_events pw_protocol_native_node_event_marshal = {
PW_VERSION_NODE_PROXY_EVENTS,
static const struct pw_node_events pw_protocol_native_node_event_marshal = {
PW_VERSION_NODE_EVENTS,
.info = &node_marshal_info,
.param = &node_marshal_param,
};
@ -1116,8 +1116,8 @@ static const struct pw_node_proxy_events pw_protocol_native_node_event_marshal =
static const struct pw_protocol_marshal pw_protocol_native_node_marshal = {
PW_TYPE_INTERFACE_Node,
PW_VERSION_NODE_V0,
PW_NODE_PROXY_V0_METHOD_NUM,
PW_NODE_PROXY_EVENT_NUM,
PW_NODE_V0_METHOD_NUM,
PW_NODE_EVENT_NUM,
0,
NULL,
pw_protocol_native_node_method_demarshal,

2
src/modules/spa/module-node-factory.c
View file

@ -242,7 +242,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
factory = pw_impl_factory_new(context,
"spa-node-factory",
PW_TYPE_INTERFACE_Node,
PW_VERSION_NODE_PROXY,
PW_VERSION_NODE,
NULL,
sizeof(*data));
if (factory == NULL)