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

Cleanup argument names in methods and events interfaces

Browse source 
First method argument is object, first event argument is data.

Closes !963
This commit is contained in:
Quentin Wenger 2021-09-27 15:09:32 +02:00 • committed by Wim Taymans
parent d3ea3142e1
commit 22fc9eec35
55 changed files with 636 additions and 636 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -308,9 +308,9 @@ core_method_marshal_destroy(void *object, void *p)
return pw_protocol_native_end_proxy(proxy, b);
}
static int core_event_demarshal_info(void *object, const struct pw_protocol_native_message *msg)
static int core_event_demarshal_info(void *data, const struct pw_protocol_native_message *msg)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_dict props = SPA_DICT_INIT(NULL, 0);
struct pw_core_info info = { .props = &props };
struct spa_pod_frame f[2];
@ -335,9 +335,9 @@ static int core_event_demarshal_info(void *object, const struct pw_protocol_nati
return pw_proxy_notify(proxy, struct pw_core_events, info, 0, &info);
}
static int core_event_demarshal_done(void *object, const struct pw_protocol_native_message *msg)
static int core_event_demarshal_done(void *data, const struct pw_protocol_native_message *msg)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_parser prs;
uint32_t id, seq;
@ -353,9 +353,9 @@ static int core_event_demarshal_done(void *object, const struct pw_protocol_nati
return pw_proxy_notify(proxy, struct pw_core_events, done, 0, id, seq);
}
static int core_event_demarshal_ping(void *object, const struct pw_protocol_native_message *msg)
static int core_event_demarshal_ping(void *data, const struct pw_protocol_native_message *msg)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_parser prs;
uint32_t id, seq;
@ -368,9 +368,9 @@ static int core_event_demarshal_ping(void *object, const struct pw_protocol_nati
return pw_proxy_notify(proxy, struct pw_core_events, ping, 0, id, seq);
}
static int core_event_demarshal_error(void *object, const struct pw_protocol_native_message *msg)
static int core_event_demarshal_error(void *data, const struct pw_protocol_native_message *msg)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_parser prs;
uint32_t id, res;
int seq;
@ -387,9 +387,9 @@ static int core_event_demarshal_error(void *object, const struct pw_protocol_nat
return pw_proxy_notify(proxy, struct pw_core_events, error, 0, id, seq, res, error);
}
static int core_event_demarshal_remove_id(void *object, const struct pw_protocol_native_message *msg)
static int core_event_demarshal_remove_id(void *data, const struct pw_protocol_native_message *msg)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_parser prs;
uint32_t id;
@ -400,9 +400,9 @@ static int core_event_demarshal_remove_id(void *object, const struct pw_protocol
return pw_proxy_notify(proxy, struct pw_core_events, remove_id, 0, id);
}
static int core_event_demarshal_bound_id(void *object, const struct pw_protocol_native_message *msg)
static int core_event_demarshal_bound_id(void *data, const struct pw_protocol_native_message *msg)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_parser prs;
uint32_t id, global_id;
@ -415,9 +415,9 @@ static int core_event_demarshal_bound_id(void *object, const struct pw_protocol_
return pw_proxy_notify(proxy, struct pw_core_events, bound_id, 0, id, global_id);
}
static int core_event_demarshal_add_mem(void *object, const struct pw_protocol_native_message *msg)
static int core_event_demarshal_add_mem(void *data, const struct pw_protocol_native_message *msg)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_parser prs;
uint32_t id, type, flags;
int64_t idx;
@ -436,9 +436,9 @@ static int core_event_demarshal_add_mem(void *object, const struct pw_protocol_n
return pw_proxy_notify(proxy, struct pw_core_events, add_mem, 0, id, type, fd, flags);
}
static int core_event_demarshal_remove_mem(void *object, const struct pw_protocol_native_message *msg)
static int core_event_demarshal_remove_mem(void *data, const struct pw_protocol_native_message *msg)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_parser prs;
uint32_t id;
@ -450,9 +450,9 @@ static int core_event_demarshal_remove_mem(void *object, const struct pw_protoco
return pw_proxy_notify(proxy, struct pw_core_events, remove_mem, 0, id);
}
static void core_event_marshal_info(void *object, const struct pw_core_info *info)
static void core_event_marshal_info(void *data, const struct pw_core_info *info)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
struct spa_pod_frame f;
@ -474,9 +474,9 @@ static void core_event_marshal_info(void *object, const struct pw_core_info *inf
pw_protocol_native_end_resource(resource, b);
}
static void core_event_marshal_done(void *object, uint32_t id, int seq)
static void core_event_marshal_done(void *data, uint32_t id, int seq)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource, PW_CORE_EVENT_DONE, NULL);
@ -488,9 +488,9 @@ static void core_event_marshal_done(void *object, uint32_t id, int seq)
pw_protocol_native_end_resource(resource, b);
}
static void core_event_marshal_ping(void *object, uint32_t id, int seq)
static void core_event_marshal_ping(void *data, uint32_t id, int seq)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
struct pw_protocol_native_message *msg;
@ -503,9 +503,9 @@ static void core_event_marshal_ping(void *object, uint32_t id, int seq)
pw_protocol_native_end_resource(resource, b);
}
static void core_event_marshal_error(void *object, uint32_t id, int seq, int res, const char *error)
static void core_event_marshal_error(void *data, uint32_t id, int seq, int res, const char *error)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource, PW_CORE_EVENT_ERROR, NULL);
@ -519,9 +519,9 @@ static void core_event_marshal_error(void *object, uint32_t id, int seq, int res
pw_protocol_native_end_resource(resource, b);
}
static void core_event_marshal_remove_id(void *object, uint32_t id)
static void core_event_marshal_remove_id(void *data, uint32_t id)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource, PW_CORE_EVENT_REMOVE_ID, NULL);
@ -532,9 +532,9 @@ static void core_event_marshal_remove_id(void *object, uint32_t id)
pw_protocol_native_end_resource(resource, b);
}
static void core_event_marshal_bound_id(void *object, uint32_t id, uint32_t global_id)
static void core_event_marshal_bound_id(void *data, uint32_t id, uint32_t global_id)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource, PW_CORE_EVENT_BOUND_ID, NULL);
@ -546,9 +546,9 @@ static void core_event_marshal_bound_id(void *object, uint32_t id, uint32_t glob
pw_protocol_native_end_resource(resource, b);
}
static void core_event_marshal_add_mem(void *object, uint32_t id, uint32_t type, int fd, uint32_t flags)
static void core_event_marshal_add_mem(void *data, uint32_t id, uint32_t type, int fd, uint32_t flags)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource, PW_CORE_EVENT_ADD_MEM, NULL);
@ -562,9 +562,9 @@ static void core_event_marshal_add_mem(void *object, uint32_t id, uint32_t type,
pw_protocol_native_end_resource(resource, b);
}
static void core_event_marshal_remove_mem(void *object, uint32_t id)
static void core_event_marshal_remove_mem(void *data, uint32_t id)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource, PW_CORE_EVENT_REMOVE_MEM, NULL);
@ -718,10 +718,10 @@ static int registry_method_marshal_add_listener(void *object,
return 0;
}
static void registry_marshal_global(void *object, uint32_t id, uint32_t permissions,
static void registry_marshal_global(void *data, uint32_t id, uint32_t permissions,
const char *type, uint32_t version, const struct spa_dict *props)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
struct spa_pod_frame f;
@ -740,9 +740,9 @@ static void registry_marshal_global(void *object, uint32_t id, uint32_t permissi
pw_protocol_native_end_resource(resource, b);
}
static void registry_marshal_global_remove(void *object, uint32_t id)
static void registry_marshal_global_remove(void *data, uint32_t id)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource, PW_REGISTRY_EVENT_GLOBAL_REMOVE, NULL);
@ -794,9 +794,9 @@ static int module_method_marshal_add_listener(void *object,
return 0;
}
static void module_marshal_info(void *object, const struct pw_module_info *info)
static void module_marshal_info(void *data, const struct pw_module_info *info)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
struct spa_pod_frame f;
@ -816,9 +816,9 @@ static void module_marshal_info(void *object, const struct pw_module_info *info)
pw_protocol_native_end_resource(resource, b);
}
static int module_demarshal_info(void *object, const struct pw_protocol_native_message *msg)
static int module_demarshal_info(void *data, const struct pw_protocol_native_message *msg)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_parser prs;
struct spa_pod_frame f[2];
struct spa_dict props = SPA_DICT_INIT(NULL, 0);
@ -849,9 +849,9 @@ static int device_method_marshal_add_listener(void *object,
return 0;
}
static void device_marshal_info(void *object, const struct pw_device_info *info)
static void device_marshal_info(void *data, const struct pw_device_info *info)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
struct spa_pod_frame f;
@ -869,9 +869,9 @@ static void device_marshal_info(void *object, const struct pw_device_info *info)
pw_protocol_native_end_resource(resource, b);
}
static int device_demarshal_info(void *object, const struct pw_protocol_native_message *msg)
static int device_demarshal_info(void *data, const struct pw_protocol_native_message *msg)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_parser prs;
struct spa_pod_frame f[2];
struct spa_dict props = SPA_DICT_INIT(NULL, 0);
@ -890,10 +890,10 @@ static int device_demarshal_info(void *object, const struct pw_protocol_native_m
return pw_proxy_notify(proxy, struct pw_device_events, info, 0, &info);
}
static void device_marshal_param(void *object, int seq, uint32_t id, uint32_t index, uint32_t next,
static void device_marshal_param(void *data, int seq, uint32_t id, uint32_t index, uint32_t next,
const struct spa_pod *param)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource, PW_DEVICE_EVENT_PARAM, NULL);
@ -908,9 +908,9 @@ static void device_marshal_param(void *object, int seq, uint32_t id, uint32_t in
pw_protocol_native_end_resource(resource, b);
}
static int device_demarshal_param(void *object, const struct pw_protocol_native_message *msg)
static int device_demarshal_param(void *data, const struct pw_protocol_native_message *msg)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_parser prs;
uint32_t id, index, next;
int seq;
@ -1043,9 +1043,9 @@ static int factory_method_marshal_add_listener(void *object,
return 0;
}
static void factory_marshal_info(void *object, const struct pw_factory_info *info)
static void factory_marshal_info(void *data, const struct pw_factory_info *info)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
struct spa_pod_frame f;
@ -1065,9 +1065,9 @@ static void factory_marshal_info(void *object, const struct pw_factory_info *inf
pw_protocol_native_end_resource(resource, b);
}
static int factory_demarshal_info(void *object, const struct pw_protocol_native_message *msg)
static int factory_demarshal_info(void *data, const struct pw_protocol_native_message *msg)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_parser prs;
struct spa_pod_frame f[2];
struct spa_dict props = SPA_DICT_INIT(NULL, 0);
@ -1098,9 +1098,9 @@ static int node_method_marshal_add_listener(void *object,
return 0;
}
static void node_marshal_info(void *object, const struct pw_node_info *info)
static void node_marshal_info(void *data, const struct pw_node_info *info)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
struct spa_pod_frame f;
@ -1124,9 +1124,9 @@ static void node_marshal_info(void *object, const struct pw_node_info *info)
pw_protocol_native_end_resource(resource, b);
}
static int node_demarshal_info(void *object, const struct pw_protocol_native_message *msg)
static int node_demarshal_info(void *data, const struct pw_protocol_native_message *msg)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_parser prs;
struct spa_pod_frame f[2];
struct spa_dict props = SPA_DICT_INIT(NULL, 0);
@ -1151,10 +1151,10 @@ static int node_demarshal_info(void *object, const struct pw_protocol_native_mes
return pw_proxy_notify(proxy, struct pw_node_events, info, 0, &info);
}
static void node_marshal_param(void *object, int seq, uint32_t id,
static void node_marshal_param(void *data, int seq, uint32_t id,
uint32_t index, uint32_t next, const struct spa_pod *param)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource, PW_NODE_EVENT_PARAM, NULL);
@ -1169,9 +1169,9 @@ static void node_marshal_param(void *object, int seq, uint32_t id,
pw_protocol_native_end_resource(resource, b);
}
static int node_demarshal_param(void *object, const struct pw_protocol_native_message *msg)
static int node_demarshal_param(void *data, const struct pw_protocol_native_message *msg)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_parser prs;
uint32_t id, index, next;
int seq;
@ -1329,9 +1329,9 @@ static int port_method_marshal_add_listener(void *object,
return 0;
}
static void port_marshal_info(void *object, const struct pw_port_info *info)
static void port_marshal_info(void *data, const struct pw_port_info *info)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
struct spa_pod_frame f;
@ -1350,9 +1350,9 @@ static void port_marshal_info(void *object, const struct pw_port_info *info)
pw_protocol_native_end_resource(resource, b);
}
static int port_demarshal_info(void *object, const struct pw_protocol_native_message *msg)
static int port_demarshal_info(void *data, const struct pw_protocol_native_message *msg)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_parser prs;
struct spa_pod_frame f[2];
struct spa_dict props = SPA_DICT_INIT(NULL, 0);
@ -1372,10 +1372,10 @@ static int port_demarshal_info(void *object, const struct pw_protocol_native_mes
return pw_proxy_notify(proxy, struct pw_port_events, info, 0, &info);
}
static void port_marshal_param(void *object, int seq, uint32_t id,
static void port_marshal_param(void *data, int seq, uint32_t id,
uint32_t index, uint32_t next, const struct spa_pod *param)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource, PW_PORT_EVENT_PARAM, NULL);
@ -1390,9 +1390,9 @@ static void port_marshal_param(void *object, int seq, uint32_t id,
pw_protocol_native_end_resource(resource, b);
}
static int port_demarshal_param(void *object, const struct pw_protocol_native_message *msg)
static int port_demarshal_param(void *data, const struct pw_protocol_native_message *msg)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_parser prs;
uint32_t id, index, next;
int seq;
@ -1493,9 +1493,9 @@ static int client_method_marshal_add_listener(void *object,
return 0;
}
static void client_marshal_info(void *object, const struct pw_client_info *info)
static void client_marshal_info(void *data, const struct pw_client_info *info)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
struct spa_pod_frame f;
@ -1512,9 +1512,9 @@ static void client_marshal_info(void *object, const struct pw_client_info *info)
pw_protocol_native_end_resource(resource, b);
}
static int client_demarshal_info(void *object, const struct pw_protocol_native_message *msg)
static int client_demarshal_info(void *data, const struct pw_protocol_native_message *msg)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_parser prs;
struct spa_pod_frame f[2];
struct spa_dict props = SPA_DICT_INIT(NULL, 0);
@ -1532,10 +1532,10 @@ static int client_demarshal_info(void *object, const struct pw_protocol_native_m
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 *data, uint32_t index, uint32_t n_permissions,
const struct pw_permission *permissions)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
struct spa_pod_frame f[2];
uint32_t i, n = 0;
@ -1564,9 +1564,9 @@ static void client_marshal_permissions(void *object, uint32_t index, uint32_t n_
pw_protocol_native_end_resource(resource, b);
}
static int client_demarshal_permissions(void *object, const struct pw_protocol_native_message *msg)
static int client_demarshal_permissions(void *data, const struct pw_protocol_native_message *msg)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct pw_permission *permissions;
struct spa_pod_parser prs;
struct spa_pod_frame f[2];
@ -1721,9 +1721,9 @@ static int link_method_marshal_add_listener(void *object,
return 0;
}
static void link_marshal_info(void *object, const struct pw_link_info *info)
static void link_marshal_info(void *data, const struct pw_link_info *info)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
struct spa_pod_frame f;
@ -1747,9 +1747,9 @@ static void link_marshal_info(void *object, const struct pw_link_info *info)
pw_protocol_native_end_resource(resource, b);
}
static int link_demarshal_info(void *object, const struct pw_protocol_native_message *msg)
static int link_demarshal_info(void *data, const struct pw_protocol_native_message *msg)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_parser prs;
struct spa_pod_frame f[2];
struct spa_dict props = SPA_DICT_INIT(NULL, 0);
@ -1774,9 +1774,9 @@ static int link_demarshal_info(void *object, const struct pw_protocol_native_mes
return pw_proxy_notify(proxy, struct pw_link_events, info, 0, &info);
}
static int registry_demarshal_global(void *object, const struct pw_protocol_native_message *msg)
static int registry_demarshal_global(void *data, const struct pw_protocol_native_message *msg)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_parser prs;
struct spa_pod_frame f[2];
uint32_t id, permissions, version;
@ -1798,9 +1798,9 @@ static int registry_demarshal_global(void *object, const struct pw_protocol_nati
global, 0, id, permissions, type, version, &props);
}
static int registry_demarshal_global_remove(void *object, const struct pw_protocol_native_message *msg)
static int registry_demarshal_global_remove(void *data, const struct pw_protocol_native_message *msg)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_parser prs;
uint32_t id;

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

@ -192,7 +192,7 @@ struct pw_core_v0_events {
* \param types the types as a string
* \param n_types the number of \a types
*/
void (*update_types) (void *object,
void (*update_types) (void *data,
uint32_t first_id,
const char **types,
uint32_t n_types);
@ -203,7 +203,7 @@ struct pw_core_v0_events {
* same sequence number.
* \param seq the sequence number passed to the sync method call
*/
void (*done) (void *object, uint32_t seq);
void (*done) (void *data, uint32_t seq);
/**
* Fatal error event
*
@ -216,7 +216,7 @@ struct pw_core_v0_events {
* \param res error code
* \param error error description
*/
void (*error) (void *object, uint32_t id, int res, const char *error, ...);
void (*error) (void *data, uint32_t id, int res, const char *error, ...);
/**
* Remove an object ID
*
@ -227,13 +227,13 @@ struct pw_core_v0_events {
* safely reuse the object ID.
* \param id deleted object ID
*/
void (*remove_id) (void *object, uint32_t id);
void (*remove_id) (void *data, uint32_t id);
/**
* Notify new core info
*
* \param info new core info
*/
void (*info) (void *object, struct pw_core_info *info);
void (*info) (void *data, struct pw_core_info *info);
};
#define pw_core_resource_v0_update_types(r,...) pw_resource_notify(r,struct pw_core_v0_events,update_types,__VA_ARGS__)
@ -319,7 +319,7 @@ struct pw_registry_v0_events {
* \param version the version of the interface
* \param props extra properties of the global
*/
void (*global) (void *object, uint32_t id, uint32_t parent_id,
void (*global) (void *data, uint32_t id, uint32_t parent_id,
uint32_t permissions, uint32_t type, uint32_t version,
const struct spa_dict *props);
/**
@ -331,7 +331,7 @@ struct pw_registry_v0_events {
*
* \param id the id of the global that was removed
*/
void (*global_remove) (void *object, uint32_t id);
void (*global_remove) (void *data, uint32_t id);
};
#define pw_registry_resource_v0_global(r,...) pw_resource_notify(r,struct pw_registry_v0_events,global,__VA_ARGS__)
@ -352,7 +352,7 @@ struct pw_module_v0_events {
*
* \param info info about the module
*/
void (*info) (void *object, struct pw_module_info *info);
void (*info) (void *data, struct pw_module_info *info);
};
#define pw_module_resource_v0_info(r,...) pw_resource_notify(r,struct pw_module_v0_events,info,__VA_ARGS__)
@ -372,7 +372,7 @@ struct pw_node_v0_events {
*
* \param info info about the node
*/
void (*info) (void *object, struct pw_node_info *info);
void (*info) (void *data, struct pw_node_info *info);
/**
* Notify a node param
*
@ -383,7 +383,7 @@ struct pw_node_v0_events {
* \param next the param index of the next param
* \param param the parameter
*/
void (*param) (void *object,
void (*param) (void *data,
uint32_t id, uint32_t index, uint32_t next,
const struct spa_pod *param);
};
@ -428,7 +428,7 @@ struct pw_port_v0_events {
*
* \param info info about the port
*/
void (*info) (void *object, struct pw_port_info *info);
void (*info) (void *data, struct pw_port_info *info);
/**
* Notify a port param
*
@ -439,7 +439,7 @@ struct pw_port_v0_events {
* \param next the param index of the next param
* \param param the parameter
*/
void (*param) (void *object,
void (*param) (void *data,
uint32_t id, uint32_t index, uint32_t next,
const struct spa_pod *param);
};
@ -483,7 +483,7 @@ struct pw_factory_v0_events {
*
* \param info info about the factory
*/
void (*info) (void *object, struct pw_factory_info *info);
void (*info) (void *data, struct pw_factory_info *info);
};
#define pw_factory_resource_v0_info(r,...) pw_resource_notify(r,struct pw_factory_v0_events,info,__VA_ARGS__)
@ -502,7 +502,7 @@ struct pw_client_v0_events {
*
* \param info info about the client
*/
void (*info) (void *object, struct pw_client_info *info);
void (*info) (void *data, struct pw_client_info *info);
};
#define pw_client_resource_v0_info(r,...) pw_resource_notify(r,struct pw_client_v0_events,info,__VA_ARGS__)
@ -522,7 +522,7 @@ struct pw_link_v0_events {
*
* \param info info about the link
*/
void (*info) (void *object, struct pw_link_info *info);
void (*info) (void *data, struct pw_link_info *info);
};
#define pw_link_resource_v0_info(r,...) pw_resource_notify(r,struct pw_link_v0_events,info,__VA_ARGS__)

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

@ -83,9 +83,9 @@ update_types_server(struct pw_resource *resource)
}
static void core_marshal_info(void *object, const struct pw_core_info *info)
static void core_marshal_info(void *data, const struct pw_core_info *info)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct pw_impl_client *client = pw_resource_get_client(resource);
struct protocol_compat_v2 *compat_v2 = client->compat_v2;
struct spa_pod_builder *b;
@ -138,9 +138,9 @@ static void core_marshal_info(void *object, const struct pw_core_info *info)
pw_protocol_native_end_resource(resource, b);
}
static void core_marshal_done(void *object, uint32_t id, int seq)
static void core_marshal_done(void *data, uint32_t id, int seq)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource, PW_CORE_V0_EVENT_DONE, NULL);
@ -150,9 +150,9 @@ static void core_marshal_done(void *object, uint32_t id, int seq)
pw_protocol_native_end_resource(resource, b);
}
static void core_marshal_error(void *object, uint32_t id, int seq, int res, const char *error)
static void core_marshal_error(void *data, uint32_t id, int seq, int res, const char *error)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource, PW_CORE_V0_EVENT_ERROR, NULL);
@ -165,9 +165,9 @@ static void core_marshal_error(void *object, uint32_t id, int seq, int res, cons
pw_protocol_native_end_resource(resource, b);
}
static void core_marshal_remove_id(void *object, uint32_t id)
static void core_marshal_remove_id(void *data, uint32_t id)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource, PW_CORE_V0_EVENT_REMOVE_ID, NULL);
@ -798,10 +798,10 @@ static int core_demarshal_update_types_server(void *object, const struct pw_prot
return 0;
}
static void registry_marshal_global(void *object, uint32_t id, uint32_t permissions,
static void registry_marshal_global(void *data, uint32_t id, uint32_t permissions,
const char *type, uint32_t version, const struct spa_dict *props)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct pw_impl_client *client = pw_resource_get_client(resource);
struct spa_pod_builder *b;
struct spa_pod_frame f;
@ -854,9 +854,9 @@ static void registry_marshal_global(void *object, uint32_t id, uint32_t permissi
pw_protocol_native_end_resource(resource, b);
}
static void registry_marshal_global_remove(void *object, uint32_t id)
static void registry_marshal_global_remove(void *data, uint32_t id)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource, PW_REGISTRY_V0_EVENT_GLOBAL_REMOVE, NULL);
@ -889,9 +889,9 @@ static int registry_demarshal_bind(void *object, const struct pw_protocol_native
return pw_resource_notify(resource, struct pw_registry_methods, bind, 0, id, type_name, version, new_id);
}
static void module_marshal_info(void *object, const struct pw_module_info *info)
static void module_marshal_info(void *data, const struct pw_module_info *info)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
struct spa_pod_frame f;
uint32_t i, n_items;
@ -919,9 +919,9 @@ static void module_marshal_info(void *object, const struct pw_module_info *info)
pw_protocol_native_end_resource(resource, b);
}
static void factory_marshal_info(void *object, const struct pw_factory_info *info)
static void factory_marshal_info(void *data, const struct pw_factory_info *info)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct pw_impl_client *client = pw_resource_get_client(resource);
struct spa_pod_builder *b;
struct spa_pod_frame f;
@ -956,9 +956,9 @@ static void factory_marshal_info(void *object, const struct pw_factory_info *inf
pw_protocol_native_end_resource(resource, b);
}
static void node_marshal_info(void *object, const struct pw_node_info *info)
static void node_marshal_info(void *data, const struct pw_node_info *info)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
struct spa_pod_frame f;
uint32_t i, n_items;
@ -990,10 +990,10 @@ static void node_marshal_info(void *object, const struct pw_node_info *info)
pw_protocol_native_end_resource(resource, b);
}
static void node_marshal_param(void *object, int seq, uint32_t id, uint32_t index, uint32_t next,
static void node_marshal_param(void *data, int seq, uint32_t id, uint32_t index, uint32_t next,
const struct spa_pod *param)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct pw_impl_client *client = pw_resource_get_client(resource);
struct spa_pod_builder *b;
struct spa_pod_frame f;
@ -1037,9 +1037,9 @@ static int node_demarshal_enum_params(void *object, const struct pw_protocol_nat
0, id, index, num, filter);
}
static void port_marshal_info(void *object, const struct pw_port_info *info)
static void port_marshal_info(void *data, const struct pw_port_info *info)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
struct spa_pod_frame f;
uint32_t i, n_items;
@ -1083,10 +1083,10 @@ static void port_marshal_info(void *object, const struct pw_port_info *info)
pw_protocol_native_end_resource(resource, b);
}
static void port_marshal_param(void *object, int seq, uint32_t id, uint32_t index, uint32_t next,
static void port_marshal_param(void *data, int seq, uint32_t id, uint32_t index, uint32_t next,
const struct spa_pod *param)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct pw_impl_client *client = pw_resource_get_client(resource);
struct spa_pod_builder *b;
struct spa_pod_frame f;
@ -1130,9 +1130,9 @@ static int port_demarshal_enum_params(void *object, const struct pw_protocol_nat
0, id, index, num, filter);
}
static void client_marshal_info(void *object, const struct pw_client_info *info)
static void client_marshal_info(void *data, const struct pw_client_info *info)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
struct spa_pod_frame f;
uint32_t i, n_items;
@ -1157,15 +1157,15 @@ static void client_marshal_info(void *object, const struct pw_client_info *info)
pw_protocol_native_end_resource(resource, b);
}
static void client_marshal_permissions(void *object, uint32_t index, uint32_t n_permissions,
static void client_marshal_permissions(void *data, uint32_t index, uint32_t n_permissions,
const struct pw_permission *permissions)
{
}
static void link_marshal_info(void *object, const struct pw_link_info *info)
static void link_marshal_info(void *data, const struct pw_link_info *info)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
struct spa_pod_frame f;
uint32_t i, n_items;