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

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

32
src/modules/module-client-device/protocol-native.c
View file

@ -218,10 +218,10 @@ static int device_demarshal_set_param(void *object, const struct pw_protocol_nat
return 0;
}
static void device_marshal_info(void *object,
static void device_marshal_info(void *data,
const struct spa_device_info *info)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_builder *b;
struct spa_pod_frame f[2];
uint32_t i, n_items;
@ -262,10 +262,10 @@ static void device_marshal_info(void *object,
pw_protocol_native_end_proxy(proxy, b);
}
static int device_demarshal_info(void *object,
static int device_demarshal_info(void *data,
const struct pw_protocol_native_message *msg)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_parser prs;
struct spa_pod *ipod;
struct spa_device_info info = SPA_DEVICE_INFO_INIT(), *infop;
@ -306,10 +306,10 @@ static int device_demarshal_info(void *object,
return 0;
}
static void device_marshal_result(void *object,
static void device_marshal_result(void *data,
int seq, int res, uint32_t type, const void *result)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_builder *b;
struct spa_pod_frame f[2];
@ -342,10 +342,10 @@ static void device_marshal_result(void *object,
pw_protocol_native_end_proxy(proxy, b);
}
static int device_demarshal_result(void *object,
static int device_demarshal_result(void *data,
const struct pw_protocol_native_message *msg)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_parser prs;
struct spa_pod_frame f[1];
int seq, res;
@ -384,9 +384,9 @@ static int device_demarshal_result(void *object,
return 0;
}
static void device_marshal_event(void *object, const struct spa_event *event)
static void device_marshal_event(void *data, const struct spa_event *event)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_proxy(proxy, SPA_DEVICE_EVENT_EVENT, NULL);
@ -397,10 +397,10 @@ static void device_marshal_event(void *object, const struct spa_event *event)
pw_protocol_native_end_proxy(proxy, b);
}
static int device_demarshal_event(void *object,
static int device_demarshal_event(void *data,
const struct pw_protocol_native_message *msg)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_parser prs;
struct spa_event *event;
@ -413,10 +413,10 @@ static int device_demarshal_event(void *object,
return 0;
}
static void device_marshal_object_info(void *object, uint32_t id,
static void device_marshal_object_info(void *data, uint32_t id,
const struct spa_device_object_info *info)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_builder *b;
struct spa_pod_frame f[2];
uint32_t i, n_items;
@ -452,10 +452,10 @@ static void device_marshal_object_info(void *object, uint32_t id,
pw_protocol_native_end_proxy(proxy, b);
}
static int device_demarshal_object_info(void *object,
static int device_demarshal_object_info(void *data,
const struct pw_protocol_native_message *msg)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_parser prs;
struct spa_device_object_info info = SPA_DEVICE_OBJECT_INFO_INIT(), *infop;
struct spa_pod *ipod;

96
src/modules/module-client-node/protocol-native.c
View file

@ -374,9 +374,9 @@ client_node_marshal_port_buffers(void *object,
return pw_protocol_native_end_proxy(proxy, b);
}
static int client_node_demarshal_transport(void *object, const struct pw_protocol_native_message *msg)
static int client_node_demarshal_transport(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 mem_id, offset, sz;
int64_t ridx, widx;
@ -403,9 +403,9 @@ static int client_node_demarshal_transport(void *object, const struct pw_protoco
return 0;
}
static int client_node_demarshal_set_param(void *object, const struct pw_protocol_native_message *msg)
static int client_node_demarshal_set_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, flags;
const struct spa_pod *param = NULL;
@ -421,9 +421,9 @@ static int client_node_demarshal_set_param(void *object, const struct pw_protoco
return 0;
}
static int client_node_demarshal_event_event(void *object, const struct pw_protocol_native_message *msg)
static int client_node_demarshal_event_event(void *data, const struct pw_protocol_native_message *msg)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_parser prs;
const struct spa_event *event;
@ -436,9 +436,9 @@ static int client_node_demarshal_event_event(void *object, const struct pw_proto
return 0;
}
static int client_node_demarshal_command(void *object, const struct pw_protocol_native_message *msg)
static int client_node_demarshal_command(void *data, const struct pw_protocol_native_message *msg)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_parser prs;
const struct spa_command *command;
@ -451,9 +451,9 @@ static int client_node_demarshal_command(void *object, const struct pw_protocol_
return 0;
}
static int client_node_demarshal_add_port(void *object, const struct pw_protocol_native_message *msg)
static int client_node_demarshal_add_port(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];
int32_t direction, port_id;
@ -475,9 +475,9 @@ static int client_node_demarshal_add_port(void *object, const struct pw_protocol
return 0;
}
static int client_node_demarshal_remove_port(void *object, const struct pw_protocol_native_message *msg)
static int client_node_demarshal_remove_port(void *data, const struct pw_protocol_native_message *msg)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_parser prs;
int32_t direction, port_id;
@ -491,9 +491,9 @@ static int client_node_demarshal_remove_port(void *object, const struct pw_proto
return 0;
}
static int client_node_demarshal_port_set_param(void *object, const struct pw_protocol_native_message *msg)
static int client_node_demarshal_port_set_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 direction, port_id, id, flags;
const struct spa_pod *param = NULL;
@ -512,9 +512,9 @@ static int client_node_demarshal_port_set_param(void *object, const struct pw_pr
return 0;
}
static int client_node_demarshal_port_use_buffers(void *object, const struct pw_protocol_native_message *msg)
static int client_node_demarshal_port_use_buffers(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;
uint32_t direction, port_id, mix_id, flags, n_buffers, data_id;
@ -588,9 +588,9 @@ static int client_node_demarshal_port_use_buffers(void *object, const struct pw_
return 0;
}
static int client_node_demarshal_port_set_io(void *object, const struct pw_protocol_native_message *msg)
static int client_node_demarshal_port_set_io(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 direction, port_id, mix_id, id, memid, off, sz;
@ -612,9 +612,9 @@ static int client_node_demarshal_port_set_io(void *object, const struct pw_proto
return 0;
}
static int client_node_demarshal_set_activation(void *object, const struct pw_protocol_native_message *msg)
static int client_node_demarshal_set_activation(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 node_id, memid, off, sz;
int64_t sigidx;
@ -639,9 +639,9 @@ static int client_node_demarshal_set_activation(void *object, const struct pw_pr
return 0;
}
static int client_node_demarshal_port_set_mix_info(void *object, const struct pw_protocol_native_message *msg)
static int client_node_demarshal_port_set_mix_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;
uint32_t direction, port_id, mix_id, peer_id;
struct spa_pod_frame f[2];
@ -664,9 +664,9 @@ static int client_node_demarshal_port_set_mix_info(void *object, const struct pw
return 0;
}
static int client_node_demarshal_set_io(void *object, const struct pw_protocol_native_message *msg)
static int client_node_demarshal_set_io(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, memid, off, sz;
@ -683,11 +683,11 @@ static int client_node_demarshal_set_io(void *object, const struct pw_protocol_n
return 0;
}
static int client_node_marshal_transport(void *object, int readfd, int writefd,
static int client_node_marshal_transport(void *data, int readfd, int writefd,
uint32_t mem_id, uint32_t offset, uint32_t size)
{
struct pw_protocol_native_message *msg;
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource, PW_CLIENT_NODE_EVENT_TRANSPORT, &msg);
@ -703,10 +703,10 @@ static int client_node_marshal_transport(void *object, int readfd, int writefd,
}
static int
client_node_marshal_set_param(void *object, uint32_t id, uint32_t flags,
client_node_marshal_set_param(void *data, uint32_t id, uint32_t flags,
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_CLIENT_NODE_EVENT_SET_PARAM, NULL);
@ -719,9 +719,9 @@ client_node_marshal_set_param(void *object, uint32_t id, uint32_t flags,
return pw_protocol_native_end_resource(resource, b);
}
static int client_node_marshal_event_event(void *object, const struct spa_event *event)
static int client_node_marshal_event_event(void *data, const struct spa_event *event)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource, PW_CLIENT_NODE_EVENT_EVENT, NULL);
@ -733,9 +733,9 @@ static int client_node_marshal_event_event(void *object, const struct spa_event
}
static int
client_node_marshal_command(void *object, const struct spa_command *command)
client_node_marshal_command(void *data, const struct spa_command *command)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource, PW_CLIENT_NODE_EVENT_COMMAND, NULL);
@ -747,11 +747,11 @@ client_node_marshal_command(void *object, const struct spa_command *command)
}
static int
client_node_marshal_add_port(void *object,
client_node_marshal_add_port(void *data,
enum spa_direction direction, uint32_t port_id,
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;
@ -768,10 +768,10 @@ client_node_marshal_add_port(void *object,
}
static int
client_node_marshal_remove_port(void *object,
client_node_marshal_remove_port(void *data,
enum spa_direction direction, uint32_t port_id)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource, PW_CLIENT_NODE_EVENT_REMOVE_PORT, NULL);
@ -784,14 +784,14 @@ client_node_marshal_remove_port(void *object,
}
static int
client_node_marshal_port_set_param(void *object,
client_node_marshal_port_set_param(void *data,
enum spa_direction direction,
uint32_t port_id,
uint32_t id,
uint32_t flags,
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_CLIENT_NODE_EVENT_PORT_SET_PARAM, NULL);
@ -807,14 +807,14 @@ client_node_marshal_port_set_param(void *object,
}
static int
client_node_marshal_port_use_buffers(void *object,
client_node_marshal_port_use_buffers(void *data,
enum spa_direction direction,
uint32_t port_id,
uint32_t mix_id,
uint32_t flags,
uint32_t n_buffers, struct pw_client_node_buffer *buffers)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
struct spa_pod_frame f;
uint32_t i, j;
@ -862,7 +862,7 @@ client_node_marshal_port_use_buffers(void *object,
}
static int
client_node_marshal_port_set_io(void *object,
client_node_marshal_port_set_io(void *data,
uint32_t direction,
uint32_t port_id,
uint32_t mix_id,
@ -871,7 +871,7 @@ client_node_marshal_port_set_io(void *object,
uint32_t offset,
uint32_t size)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource, PW_CLIENT_NODE_EVENT_PORT_SET_IO, NULL);
@ -889,7 +889,7 @@ client_node_marshal_port_set_io(void *object,
}
static int
client_node_marshal_set_activation(void *object,
client_node_marshal_set_activation(void *data,
uint32_t node_id,
int signalfd,
uint32_t memid,
@ -897,7 +897,7 @@ client_node_marshal_set_activation(void *object,
uint32_t size)
{
struct pw_protocol_native_message *msg;
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource, PW_CLIENT_NODE_EVENT_SET_ACTIVATION, &msg);
@ -913,13 +913,13 @@ client_node_marshal_set_activation(void *object,
}
static int
client_node_marshal_set_io(void *object,
client_node_marshal_set_io(void *data,
uint32_t id,
uint32_t memid,
uint32_t offset,
uint32_t size)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource, PW_CLIENT_NODE_EVENT_SET_IO, NULL);
@ -932,14 +932,14 @@ client_node_marshal_set_io(void *object,
}
static int
client_node_marshal_port_set_mix_info(void *object,
client_node_marshal_port_set_mix_info(void *data,
uint32_t direction,
uint32_t port_id,
uint32_t mix_id,
uint32_t peer_id,
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;

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

@ -259,10 +259,10 @@ static struct mix *ensure_mix(struct node_data *data,
}
static int client_node_transport(void *object,
static int client_node_transport(void *_data,
int readfd, int writefd, uint32_t mem_id, uint32_t offset, uint32_t size)
{
struct node_data *data = object;
struct node_data *data = _data;
struct pw_proxy *proxy = (struct pw_proxy*)data->client_node;
clean_transport(data);
@ -416,10 +416,10 @@ static int add_port_update(struct node_data *data, struct pw_impl_port *port, ui
}
static int
client_node_set_param(void *object, uint32_t id, uint32_t flags,
client_node_set_param(void *_data, uint32_t id, uint32_t flags,
const struct spa_pod *param)
{
struct node_data *data = object;
struct node_data *data = _data;
struct pw_proxy *proxy = (struct pw_proxy*)data->client_node;
int res;
@ -440,13 +440,13 @@ client_node_set_param(void *object, uint32_t id, uint32_t flags,
}
static int
client_node_set_io(void *object,
client_node_set_io(void *_data,
uint32_t id,
uint32_t memid,
uint32_t offset,
uint32_t size)
{
struct node_data *data = object;
struct node_data *data = _data;
struct pw_proxy *proxy = (struct pw_proxy*)data->client_node;
struct pw_memmap *old, *mm;
void *ptr;
@ -483,15 +483,15 @@ exit:
return res;
}
static int client_node_event(void *object, const struct spa_event *event)
static int client_node_event(void *data, const struct spa_event *event)
{
pw_log_warn("unhandled node event %d", SPA_EVENT_TYPE(event));
return -ENOTSUP;
}
static int client_node_command(void *object, const struct spa_command *command)
static int client_node_command(void *_data, const struct spa_command *command)
{
struct node_data *data = object;
struct node_data *data = _data;
struct pw_proxy *proxy = (struct pw_proxy*)data->client_node;
int res;
@ -533,10 +533,10 @@ static int client_node_command(void *object, const struct spa_command *command)
}
static int
client_node_add_port(void *object, enum spa_direction direction, uint32_t port_id,
client_node_add_port(void *_data, enum spa_direction direction, uint32_t port_id,
const struct spa_dict *props)
{
struct node_data *data = object;
struct node_data *data = _data;
struct pw_proxy *proxy = (struct pw_proxy*)data->client_node;
pw_log_warn("add port not supported");
pw_proxy_error(proxy, -ENOTSUP, "add port not supported");
@ -544,9 +544,9 @@ client_node_add_port(void *object, enum spa_direction direction, uint32_t port_i
}
static int
client_node_remove_port(void *object, enum spa_direction direction, uint32_t port_id)
client_node_remove_port(void *_data, enum spa_direction direction, uint32_t port_id)
{
struct node_data *data = object;
struct node_data *data = _data;
struct pw_proxy *proxy = (struct pw_proxy*)data->client_node;
pw_log_warn("remove port not supported");
pw_proxy_error(proxy, -ENOTSUP, "remove port not supported");
@ -579,12 +579,12 @@ static int clear_buffers(struct node_data *data, struct mix *mix)
}
static int
client_node_port_set_param(void *object,
client_node_port_set_param(void *_data,
enum spa_direction direction, uint32_t port_id,
uint32_t id, uint32_t flags,
const struct spa_pod *param)
{
struct node_data *data = object;
struct node_data *data = _data;
struct pw_proxy *proxy = (struct pw_proxy*)data->client_node;
struct pw_impl_port *port;
int res;
@ -620,12 +620,12 @@ error_exit:
}
static int
client_node_port_use_buffers(void *object,
client_node_port_use_buffers(void *_data,
enum spa_direction direction, uint32_t port_id, uint32_t mix_id,
uint32_t flags,
uint32_t n_buffers, struct pw_client_node_buffer *buffers)
{
struct node_data *data = object;
struct node_data *data = _data;
struct pw_proxy *proxy = (struct pw_proxy*)data->client_node;
struct buffer *bid;
uint32_t i, j;
@ -769,7 +769,7 @@ error_exit:
}
static int
client_node_port_set_io(void *object,
client_node_port_set_io(void *_data,
uint32_t direction,
uint32_t port_id,
uint32_t mix_id,
@ -778,7 +778,7 @@ client_node_port_set_io(void *object,
uint32_t offset,
uint32_t size)
{
struct node_data *data = object;
struct node_data *data = _data;
struct pw_proxy *proxy = (struct pw_proxy*)data->client_node;
struct mix *mix;
struct pw_memmap *mm, *old;
@ -869,14 +869,14 @@ do_activate_link(struct spa_loop *loop,
}
static int
client_node_set_activation(void *object,
client_node_set_activation(void *_data,
uint32_t node_id,
int signalfd,
uint32_t memid,
uint32_t offset,
uint32_t size)
{
struct node_data *data = object;
struct node_data *data = _data;
struct pw_proxy *proxy = (struct pw_proxy*)data->client_node;
struct pw_impl_node *node = data->node;
struct pw_memmap *mm;

22
src/modules/module-client-node/v0/ext-client-node.h
View file

@ -259,7 +259,7 @@ struct pw_client_node0_events {
* \param memfd the fd of the memory
* \param flags flags for the \a memfd
*/
void (*add_mem) (void *object,
void (*add_mem) (void *data,
uint32_t mem_id,
uint32_t type,
int memfd,
@ -275,7 +275,7 @@ struct pw_client_node0_events {
* \param writefd fd for signal data can be written
* \param transport the shared transport area
*/
void (*transport) (void *object,
void (*transport) (void *data,
uint32_t node_id,
int readfd,
int writefd,
@ -291,20 +291,20 @@ struct pw_client_node0_events {
* \param flags parameter flags
* \param param the param to set
*/
void (*set_param) (void *object, uint32_t seq,
void (*set_param) (void *data, uint32_t seq,
uint32_t id, uint32_t flags,
const struct spa_pod *param);
/**
* Receive an event from the client node
* \param event the received event */
void (*event) (void *object, const struct spa_event *event);
void (*event) (void *data, const struct spa_event *event);
/**
* Notify of a new node command
*
* \param seq a sequence number
* \param command the command
*/
void (*command) (void *object, uint32_t seq, const struct spa_command *command);
void (*command) (void *data, uint32_t seq, const struct spa_command *command);
/**
* A new port was added to the node
*
@ -315,7 +315,7 @@ struct pw_client_node0_events {
* \param direction the direction of the port
* \param port_id the new port id
*/
void (*add_port) (void *object,
void (*add_port) (void *data,
uint32_t seq,
enum spa_direction direction,
uint32_t port_id);
@ -326,7 +326,7 @@ struct pw_client_node0_events {
* \param direction a port direction
* \param port_id the remove port id
*/
void (*remove_port) (void *object,
void (*remove_port) (void *data,
uint32_t seq,
enum spa_direction direction,
uint32_t port_id);
@ -340,7 +340,7 @@ struct pw_client_node0_events {
* \param flags flags used when setting the param
* \param param the new param
*/
void (*port_set_param) (void *object,
void (*port_set_param) (void *data,
uint32_t seq,
enum spa_direction direction,
uint32_t port_id,
@ -355,7 +355,7 @@ struct pw_client_node0_events {
* \param n_buffer the number of buffers
* \param buffers and array of buffer descriptions
*/
void (*port_use_buffers) (void *object,
void (*port_use_buffers) (void *data,
uint32_t seq,
enum spa_direction direction,
uint32_t port_id,
@ -368,7 +368,7 @@ struct pw_client_node0_events {
* \param port_id the port id
* \param command the command
*/
void (*port_command) (void *object,
void (*port_command) (void *data,
enum spa_direction direction,
uint32_t port_id,
const struct spa_command *command);
@ -384,7 +384,7 @@ struct pw_client_node0_events {
* \param offset offset of io area in memory
* \param size size of the io area
*/
void (*port_set_io) (void *object,
void (*port_set_io) (void *data,
uint32_t seq,
enum spa_direction direction,
uint32_t port_id,

44
src/modules/module-client-node/v0/protocol-native.c
View file

@ -47,12 +47,12 @@ extern uint32_t pw_protocol_native0_type_to_v2(struct pw_impl_client *client,
const struct spa_type_info *info, uint32_t type);
static void
client_node_marshal_add_mem(void *object,
client_node_marshal_add_mem(void *data,
uint32_t mem_id,
uint32_t type,
int memfd, uint32_t flags)
{
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;
const char *typename;
@ -80,10 +80,10 @@ client_node_marshal_add_mem(void *object,
pw_protocol_native_end_resource(resource, b);
}
static void client_node_marshal_transport(void *object, uint32_t node_id, int readfd, int writefd,
static void client_node_marshal_transport(void *data, uint32_t node_id, int readfd, int writefd,
struct pw_client_node0_transport *transport)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
struct pw_client_node0_transport_info info;
@ -103,10 +103,10 @@ static void client_node_marshal_transport(void *object, uint32_t node_id, int re
}
static void
client_node_marshal_set_param(void *object, uint32_t seq, uint32_t id, uint32_t flags,
client_node_marshal_set_param(void *data, uint32_t seq, uint32_t id, uint32_t flags,
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_CLIENT_NODE0_EVENT_SET_PARAM, NULL);
@ -120,9 +120,9 @@ client_node_marshal_set_param(void *object, uint32_t seq, uint32_t id, uint32_t
pw_protocol_native_end_resource(resource, b);
}
static void client_node_marshal_event_event(void *object, const struct spa_event *event)
static void client_node_marshal_event_event(void *data, const struct spa_event *event)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource, PW_CLIENT_NODE0_EVENT_EVENT, NULL);
@ -133,9 +133,9 @@ static void client_node_marshal_event_event(void *object, const struct spa_event
}
static void
client_node_marshal_command(void *object, uint32_t seq, const struct spa_command *command)
client_node_marshal_command(void *data, uint32_t seq, const struct spa_command *command)
{
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;
@ -154,10 +154,10 @@ client_node_marshal_command(void *object, uint32_t seq, const struct spa_command
}
static void
client_node_marshal_add_port(void *object,
client_node_marshal_add_port(void *data,
uint32_t seq, enum spa_direction direction, uint32_t port_id)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource, PW_CLIENT_NODE0_EVENT_ADD_PORT, NULL);
@ -171,10 +171,10 @@ client_node_marshal_add_port(void *object,
}
static void
client_node_marshal_remove_port(void *object,
client_node_marshal_remove_port(void *data,
uint32_t seq, enum spa_direction direction, uint32_t port_id)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource, PW_CLIENT_NODE0_EVENT_REMOVE_PORT, NULL);
@ -188,7 +188,7 @@ client_node_marshal_remove_port(void *object,
}
static void
client_node_marshal_port_set_param(void *object,
client_node_marshal_port_set_param(void *data,
uint32_t seq,
enum spa_direction direction,
uint32_t port_id,
@ -196,7 +196,7 @@ client_node_marshal_port_set_param(void *object,
uint32_t flags,
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;
@ -229,13 +229,13 @@ client_node_marshal_port_set_param(void *object,
}
static void
client_node_marshal_port_use_buffers(void *object,
client_node_marshal_port_use_buffers(void *data,
uint32_t seq,
enum spa_direction direction,
uint32_t port_id,
uint32_t n_buffers, struct pw_client_node0_buffer *buffers)
{
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;
@ -283,12 +283,12 @@ client_node_marshal_port_use_buffers(void *object,
}
static void
client_node_marshal_port_command(void *object,
client_node_marshal_port_command(void *data,
uint32_t direction,
uint32_t port_id,
const struct spa_command *command)
{
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;
@ -306,7 +306,7 @@ client_node_marshal_port_command(void *object,
}
static void
client_node_marshal_port_set_io(void *object,
client_node_marshal_port_set_io(void *data,
uint32_t seq,
uint32_t direction,
uint32_t port_id,
@ -315,7 +315,7 @@ client_node_marshal_port_set_io(void *object,
uint32_t offset,
uint32_t size)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource, PW_CLIENT_NODE0_EVENT_PORT_SET_IO, NULL);

8
src/modules/module-metadata/metadata.c
View file

@ -59,13 +59,13 @@ struct resource_data {
#define pw_metadata_resource_property(r,...) \
pw_metadata_resource(r,property,0,__VA_ARGS__)
static int metadata_property(void *object,
static int metadata_property(void *data,
uint32_t subject,
const char *key,
const char *type,
const char *value)
{
struct resource_data *d = object;
struct resource_data *d = data;
struct pw_resource *resource = d->resource;
struct pw_impl_client *client = pw_resource_get_client(resource);
struct impl *impl = d->impl;
@ -166,10 +166,10 @@ static const struct pw_resource_events impl_resource_events = {
};
static int
global_bind(void *_data, struct pw_impl_client *client, uint32_t permissions,
global_bind(void *object, struct pw_impl_client *client, uint32_t permissions,
uint32_t version, uint32_t id)
{
struct impl *impl = _data;
struct impl *impl = object;
struct pw_resource *resource;
struct resource_data *data;

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

@ -312,10 +312,10 @@ do_start(struct spa_loop *loop,
return 0;
}
static int
global_bind(void *_data, struct pw_impl_client *client, uint32_t permissions,
global_bind(void *object, struct pw_impl_client *client, uint32_t permissions,
uint32_t version, uint32_t id)
{
struct impl *impl = _data;
struct impl *impl = object;
struct pw_global *global = impl->global;
struct pw_resource *resource;
struct resource_data *data;

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;

32
src/modules/module-protocol-pulse/manager.c
View file

@ -215,9 +215,9 @@ static const struct object_info core_info = {
};
/* client */
static void client_event_info(void *object, const struct pw_client_info *info)
static void client_event_info(void *data, const struct pw_client_info *info)
{
struct object *o = object;
struct object *o = data;
int changed = 0;
pw_log_debug("object %p: id:%d change-mask:%08"PRIx64, o, o->this.id, info->change_mask);
@ -254,9 +254,9 @@ static const struct object_info client_info = {
};
/* module */
static void module_event_info(void *object, const struct pw_module_info *info)
static void module_event_info(void *data, const struct pw_module_info *info)
{
struct object *o = object;
struct object *o = data;
int changed = 0;
pw_log_debug("object %p: id:%d change-mask:%08"PRIx64, o, o->this.id, info->change_mask);
@ -293,9 +293,9 @@ static const struct object_info module_info = {
};
/* device */
static void device_event_info(void *object, const struct pw_device_info *info)
static void device_event_info(void *data, const struct pw_device_info *info)
{
struct object *o = object;
struct object *o = data;
uint32_t i, changed = 0;
pw_log_debug("object %p: id:%d change-mask:%08"PRIx64, o, o->this.id, info->change_mask);
@ -364,11 +364,11 @@ static struct object *find_device(struct manager *m, uint32_t card_id, uint32_t
return NULL;
}
static void device_event_param(void *object, int seq,
static void device_event_param(void *data, int seq,
uint32_t id, uint32_t index, uint32_t next,
const struct spa_pod *param)
{
struct object *o = object, *dev;
struct object *o = data, *dev;
struct manager *m = o->manager;
struct pw_manager_param *p;
@ -413,9 +413,9 @@ static const struct object_info device_info = {
};
/* node */
static void node_event_info(void *object, const struct pw_node_info *info)
static void node_event_info(void *data, const struct pw_node_info *info)
{
struct object *o = object;
struct object *o = data;
uint32_t i, changed = 0;
pw_log_debug("object %p: id:%d change-mask:%08"PRIx64, o, o->this.id, info->change_mask);
@ -459,11 +459,11 @@ static void node_event_info(void *object, const struct pw_node_info *info)
}
}
static void node_event_param(void *object, int seq,
static void node_event_param(void *data, int seq,
uint32_t id, uint32_t index, uint32_t next,
const struct spa_pod *param)
{
struct object *o = object;
struct object *o = data;
add_param(&o->pending_list, seq, o->param_seq, id, param);
}
@ -495,13 +495,13 @@ static const struct object_info link_info = {
};
/* metadata */
static int metadata_property(void *object,
static int metadata_property(void *data,
uint32_t subject,
const char *key,
const char *type,
const char *value)
{
struct object *o = object;
struct object *o = data;
struct manager *m = o->manager;
manager_emit_metadata(m, &o->this, subject, key, type, value);
return 0;
@ -639,9 +639,9 @@ static void registry_event_global(void *data, uint32_t id,
core_sync(m);
}
static void registry_event_global_remove(void *object, uint32_t id)
static void registry_event_global_remove(void *data, uint32_t id)
{
struct manager *m = object;
struct manager *m = data;
struct object *o;
if ((o = find_object_by_id(m, id)) == NULL)

14
src/modules/module-rt.c
View file

@ -612,7 +612,7 @@ static int impl_acquire_rt_sched(struct spa_thread *thread, int priority)
return 0;
}
static int impl_drop_rt_generic(void *data, struct spa_thread *thread)
static int impl_drop_rt_generic(void *object, struct spa_thread *thread)
{
struct sched_param sp;
pthread_t pt = (pthread_t)thread;
@ -685,9 +685,9 @@ exit:
return (struct spa_thread*)this->thread;
}
static int impl_join(void *data, struct spa_thread *thread, void **retval)
static int impl_join(void *object, struct spa_thread *thread, void **retval)
{
struct impl *impl = data;
struct impl *impl = object;
pthread_t pt = (pthread_t)thread;
struct thread *thr;
@ -701,10 +701,10 @@ static int impl_join(void *data, struct spa_thread *thread, void **retval)
return pthread_join(pt, retval);
}
static int impl_get_rt_range(void *data, const struct spa_dict *props,
static int impl_get_rt_range(void *object, const struct spa_dict *props,
int *min, int *max)
{
struct impl *impl = data;
struct impl *impl = object;
if (impl->use_rtkit) {
if (min)
*min = 1;
@ -735,9 +735,9 @@ static pid_t impl_gettid(struct impl *impl, pthread_t pt)
return pid;
}
static int impl_acquire_rt(void *data, struct spa_thread *thread, int priority)
static int impl_acquire_rt(void *object, struct spa_thread *thread, int priority)
{
struct impl *impl = data;
struct impl *impl = object;
struct sched_param sp;
int err, rtprio_limit;
pthread_t pt = (pthread_t)thread;

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

@ -183,10 +183,10 @@ static const struct pw_endpoint_link_methods link_methods = {
.request_state = method_request_state,
};
static int global_bind(void *_data, struct pw_impl_client *client,
static int global_bind(void *object, struct pw_impl_client *client,
uint32_t permissions, uint32_t version, uint32_t id)
{
struct impl *impl = _data;
struct impl *impl = object;
struct pw_resource *resource;
struct resource_data *data;
@ -285,9 +285,9 @@ static int emit_info(void *data, struct pw_resource *resource)
return 0;
}
static void event_info(void *object, const struct pw_endpoint_link_info *info)
static void event_info(void *data, const struct pw_endpoint_link_info *info)
{
struct impl *impl = object;
struct impl *impl = data;
uint32_t changed_ids[MAX_PARAMS], n_changed_ids = 0;
uint32_t i;
@ -350,11 +350,11 @@ static int emit_param(void *_data, struct pw_resource *resource)
return 0;
}
static void event_param(void *object, int seq,
static void event_param(void *data, int seq,
uint32_t id, uint32_t index, uint32_t next,
const struct spa_pod *param)
{
struct impl *impl = object;
struct impl *impl = data;
struct param_data *pdata;
struct spa_pod **pod;
struct param_event_args args = { id, index, next, param };

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

@ -174,10 +174,10 @@ static const struct pw_endpoint_stream_methods stream_methods = {
.set_param = method_set_param,
};
static int global_bind(void *_data, struct pw_impl_client *client,
static int global_bind(void *object, struct pw_impl_client *client,
uint32_t permissions, uint32_t version, uint32_t id)
{
struct impl *impl = _data;
struct impl *impl = object;
struct pw_resource *resource;
struct resource_data *data;
@ -276,9 +276,9 @@ static int emit_info(void *data, struct pw_resource *resource)
return 0;
}
static void event_info(void *object, const struct pw_endpoint_stream_info *info)
static void event_info(void *data, const struct pw_endpoint_stream_info *info)
{
struct impl *impl = object;
struct impl *impl = data;
uint32_t changed_ids[MAX_PARAMS], n_changed_ids = 0;
uint32_t i;
@ -341,11 +341,11 @@ static int emit_param(void *_data, struct pw_resource *resource)
return 0;
}
static void event_param(void *object, int seq,
static void event_param(void *data, int seq,
uint32_t id, uint32_t index, uint32_t next,
const struct spa_pod *param)
{
struct impl *impl = object;
struct impl *impl = data;
struct param_data *pdata;
struct spa_pod **pod;
struct param_event_args args = { id, index, next, param };

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

@ -183,10 +183,10 @@ static const struct pw_endpoint_methods endpoint_methods = {
.create_link = method_create_link,
};
static int global_bind(void *_data, struct pw_impl_client *client,
static int global_bind(void *object, struct pw_impl_client *client,
uint32_t permissions, uint32_t version, uint32_t id)
{
struct impl *impl = _data;
struct impl *impl = object;
struct pw_resource *resource;
struct resource_data *data;
@ -285,9 +285,9 @@ static int emit_info(void *data, struct pw_resource *resource)
return 0;
}
static void event_info(void *object, const struct pw_endpoint_info *info)
static void event_info(void *data, const struct pw_endpoint_info *info)
{
struct impl *impl = object;
struct impl *impl = data;
uint32_t changed_ids[MAX_PARAMS], n_changed_ids = 0;
uint32_t i;
@ -350,11 +350,11 @@ static int emit_param(void *_data, struct pw_resource *resource)
return 0;
}
static void event_param(void *object, int seq,
static void event_param(void *data, int seq,
uint32_t id, uint32_t index, uint32_t next,
const struct spa_pod *param)
{
struct impl *impl = object;
struct impl *impl = data;
struct param_data *pdata;
struct spa_pod **pod;
struct param_event_args args = { id, index, next, param };

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

@ -470,10 +470,10 @@ static int client_endpoint_marshal_stream_update(void *object,
return pw_protocol_native_end_proxy(proxy, b);
}
static int client_endpoint_demarshal_set_session_id(void *object,
static int client_endpoint_demarshal_set_session_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;
@ -486,10 +486,10 @@ static int client_endpoint_demarshal_set_session_id(void *object,
set_session_id, 0, id);
}
static int client_endpoint_demarshal_set_param(void *object,
static int client_endpoint_demarshal_set_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, flags;
const struct spa_pod *param = NULL;
@ -505,10 +505,10 @@ static int client_endpoint_demarshal_set_param(void *object,
set_param, 0, id, flags, param);
}
static int client_endpoint_demarshal_stream_set_param(void *object,
static int client_endpoint_demarshal_stream_set_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 stream_id, id, flags;
const struct spa_pod *param = NULL;
@ -525,10 +525,10 @@ static int client_endpoint_demarshal_stream_set_param(void *object,
stream_set_param, 0, stream_id, id, flags, param);
}
static int client_endpoint_demarshal_create_link(void *object,
static int client_endpoint_demarshal_create_link(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;
struct spa_dict props = SPA_DICT_INIT(NULL, 0);
@ -672,11 +672,11 @@ static const struct pw_protocol_marshal pw_protocol_native_client_endpoint_marsh
* CLIENT SESSION
***********************************************/
static int client_session_marshal_set_param (void *object,
static int client_session_marshal_set_param (void *data,
uint32_t id, uint32_t flags,
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,
@ -690,11 +690,11 @@ static int client_session_marshal_set_param (void *object,
return pw_protocol_native_end_resource(resource, b);
}
static int client_session_marshal_link_set_param (void *object,
static int client_session_marshal_link_set_param (void *data,
uint32_t link_id, uint32_t id,
uint32_t flags, 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,
@ -709,10 +709,10 @@ static int client_session_marshal_link_set_param (void *object,
return pw_protocol_native_end_resource(resource, b);
}
static int client_session_marshal_link_request_state (void *object,
static int client_session_marshal_link_request_state (void *data,
uint32_t link_id, uint32_t state)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource,
@ -803,10 +803,10 @@ static int client_session_marshal_link_update(void *object,
return pw_protocol_native_end_proxy(proxy, b);
}
static int client_session_demarshal_set_param(void *object,
static int client_session_demarshal_set_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, flags;
const struct spa_pod *param = NULL;
@ -822,10 +822,10 @@ static int client_session_demarshal_set_param(void *object,
set_param, 0, id, flags, param);
}
static int client_session_demarshal_link_set_param(void *object,
static int client_session_demarshal_link_set_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 link_id, id, flags;
const struct spa_pod *param = NULL;
@ -842,10 +842,10 @@ static int client_session_demarshal_link_set_param(void *object,
link_set_param, 0, link_id, id, flags, param);
}
static int client_session_demarshal_link_request_state(void *object,
static int client_session_demarshal_link_request_state(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 link_id, state;
@ -988,10 +988,10 @@ static const struct pw_protocol_marshal pw_protocol_native_client_session_marsha
* ENDPOINT LINK
***********************************************/
static void endpoint_link_proxy_marshal_info (void *object,
static void endpoint_link_proxy_marshal_info (void *data,
const struct pw_endpoint_link_info *info)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_proxy(proxy,
@ -1002,10 +1002,10 @@ static void endpoint_link_proxy_marshal_info (void *object,
pw_protocol_native_end_proxy(proxy, b);
}
static void endpoint_link_resource_marshal_info (void *object,
static void endpoint_link_resource_marshal_info (void *data,
const struct pw_endpoint_link_info *info)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource,
@ -1016,11 +1016,11 @@ static void endpoint_link_resource_marshal_info (void *object,
pw_protocol_native_end_resource(resource, b);
}
static void endpoint_link_proxy_marshal_param (void *object, int seq, uint32_t id,
static void endpoint_link_proxy_marshal_param (void *data, int seq, uint32_t id,
uint32_t index, uint32_t next,
const struct spa_pod *param)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_proxy(proxy,
@ -1035,11 +1035,11 @@ static void endpoint_link_proxy_marshal_param (void *object, int seq, uint32_t i
pw_protocol_native_end_proxy(proxy, b);
}
static void endpoint_link_resource_marshal_param (void *object, int seq, uint32_t id,
static void endpoint_link_resource_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,
@ -1213,10 +1213,10 @@ static int endpoint_link_resource_marshal_request_state(void *object,
return pw_protocol_native_end_resource(resource, b);
}
static int endpoint_link_proxy_demarshal_info(void *object,
static int endpoint_link_proxy_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;
struct spa_dict props = SPA_DICT_INIT(NULL, 0);
@ -1230,10 +1230,10 @@ static int endpoint_link_proxy_demarshal_info(void *object,
info, 0, &info);
}
static int endpoint_link_resource_demarshal_info(void *object,
static int endpoint_link_resource_demarshal_info(void *data,
const struct pw_protocol_native_message *msg)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_parser prs;
struct spa_pod_frame f;
struct spa_dict props = SPA_DICT_INIT(NULL, 0);
@ -1247,10 +1247,10 @@ static int endpoint_link_resource_demarshal_info(void *object,
info, 0, &info);
}
static int endpoint_link_proxy_demarshal_param(void *object,
static int endpoint_link_proxy_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;
@ -1269,10 +1269,10 @@ static int endpoint_link_proxy_demarshal_param(void *object,
param, 0, seq, id, index, next, param);
}
static int endpoint_link_resource_demarshal_param(void *object,
static int endpoint_link_resource_demarshal_param(void *data,
const struct pw_protocol_native_message *msg)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_parser prs;
uint32_t id, index, next;
int seq;
@ -1537,10 +1537,10 @@ static const struct pw_protocol_marshal pw_protocol_native_endpoint_link_impl_ma
* ENDPOINT STREAM
***********************************************/
static void endpoint_stream_proxy_marshal_info (void *object,
static void endpoint_stream_proxy_marshal_info (void *data,
const struct pw_endpoint_stream_info *info)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_proxy(proxy,
@ -1551,10 +1551,10 @@ static void endpoint_stream_proxy_marshal_info (void *object,
pw_protocol_native_end_proxy(proxy, b);
}
static void endpoint_stream_resource_marshal_info (void *object,
static void endpoint_stream_resource_marshal_info (void *data,
const struct pw_endpoint_stream_info *info)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource,
@ -1565,11 +1565,11 @@ static void endpoint_stream_resource_marshal_info (void *object,
pw_protocol_native_end_resource(resource, b);
}
static void endpoint_stream_proxy_marshal_param (void *object, int seq, uint32_t id,
static void endpoint_stream_proxy_marshal_param (void *data, int seq, uint32_t id,
uint32_t index, uint32_t next,
const struct spa_pod *param)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_proxy(proxy,
@ -1585,11 +1585,11 @@ static void endpoint_stream_proxy_marshal_param (void *object, int seq, uint32_t
pw_protocol_native_end_proxy(proxy, b);
}
static void endpoint_stream_resource_marshal_param (void *object, int seq, uint32_t id,
static void endpoint_stream_resource_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,
@ -1735,10 +1735,10 @@ static int endpoint_stream_resource_marshal_set_param(void *object,
return pw_protocol_native_end_resource(resource, b);
}
static int endpoint_stream_proxy_demarshal_info(void *object,
static int endpoint_stream_proxy_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;
struct spa_dict props = SPA_DICT_INIT(NULL, 0);
@ -1752,10 +1752,10 @@ static int endpoint_stream_proxy_demarshal_info(void *object,
info, 0, &info);
}
static int endpoint_stream_resource_demarshal_info(void *object,
static int endpoint_stream_resource_demarshal_info(void *data,
const struct pw_protocol_native_message *msg)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_parser prs;
struct spa_pod_frame f;
struct spa_dict props = SPA_DICT_INIT(NULL, 0);
@ -1769,10 +1769,10 @@ static int endpoint_stream_resource_demarshal_info(void *object,
info, 0, &info);
}
static int endpoint_stream_proxy_demarshal_param(void *object,
static int endpoint_stream_proxy_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;
@ -1791,10 +1791,10 @@ static int endpoint_stream_proxy_demarshal_param(void *object,
param, 0, seq, id, index, next, param);
}
static int endpoint_stream_resource_demarshal_param(void *object,
static int endpoint_stream_resource_demarshal_param(void *data,
const struct pw_protocol_native_message *msg)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_parser prs;
uint32_t id, index, next;
int seq;
@ -2023,10 +2023,10 @@ static const struct pw_protocol_marshal pw_protocol_native_endpoint_stream_impl_
* ENDPOINT
***********************************************/
static void endpoint_proxy_marshal_info (void *object,
static void endpoint_proxy_marshal_info (void *data,
const struct pw_endpoint_info *info)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_proxy(proxy,
@ -2037,10 +2037,10 @@ static void endpoint_proxy_marshal_info (void *object,
pw_protocol_native_end_proxy(proxy, b);
}
static void endpoint_resource_marshal_info (void *object,
static void endpoint_resource_marshal_info (void *data,
const struct pw_endpoint_info *info)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource,
@ -2051,11 +2051,11 @@ static void endpoint_resource_marshal_info (void *object,
pw_protocol_native_end_resource(resource, b);
}
static void endpoint_proxy_marshal_param (void *object, int seq, uint32_t id,
static void endpoint_proxy_marshal_param (void *data, int seq, uint32_t id,
uint32_t index, uint32_t next,
const struct spa_pod *param)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_proxy(proxy,
@ -2071,11 +2071,11 @@ static void endpoint_proxy_marshal_param (void *object, int seq, uint32_t id,
pw_protocol_native_end_proxy(proxy, b);
}
static void endpoint_resource_marshal_param (void *object, int seq, uint32_t id,
static void endpoint_resource_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,
@ -2249,10 +2249,10 @@ static int endpoint_resource_marshal_create_link(void *object,
return pw_protocol_native_end_resource(resource, b);
}
static int endpoint_proxy_demarshal_info(void *object,
static int endpoint_proxy_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;
struct spa_dict props = SPA_DICT_INIT(NULL, 0);
@ -2266,10 +2266,10 @@ static int endpoint_proxy_demarshal_info(void *object,
info, 0, &info);
}
static int endpoint_resource_demarshal_info(void *object,
static int endpoint_resource_demarshal_info(void *data,
const struct pw_protocol_native_message *msg)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_parser prs;
struct spa_pod_frame f;
struct spa_dict props = SPA_DICT_INIT(NULL, 0);
@ -2283,10 +2283,10 @@ static int endpoint_resource_demarshal_info(void *object,
info, 0, &info);
}
static int endpoint_proxy_demarshal_param(void *object,
static int endpoint_proxy_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;
@ -2305,10 +2305,10 @@ static int endpoint_proxy_demarshal_param(void *object,
param, 0, seq, id, index, next, param);
}
static int endpoint_resource_demarshal_param(void *object,
static int endpoint_resource_demarshal_param(void *data,
const struct pw_protocol_native_message *msg)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_parser prs;
uint32_t id, index, next;
int seq;
@ -2573,10 +2573,10 @@ static const struct pw_protocol_marshal pw_protocol_native_endpoint_impl_marshal
* SESSION
***********************************************/
static void session_proxy_marshal_info (void *object,
static void session_proxy_marshal_info (void *data,
const struct pw_session_info *info)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_proxy(proxy,
@ -2587,10 +2587,10 @@ static void session_proxy_marshal_info (void *object,
pw_protocol_native_end_proxy(proxy, b);
}
static void session_resource_marshal_info (void *object,
static void session_resource_marshal_info (void *data,
const struct pw_session_info *info)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_resource(resource,
@ -2601,11 +2601,11 @@ static void session_resource_marshal_info (void *object,
pw_protocol_native_end_resource(resource, b);
}
static void session_proxy_marshal_param (void *object, int seq, uint32_t id,
static void session_proxy_marshal_param (void *data, int seq, uint32_t id,
uint32_t index, uint32_t next,
const struct spa_pod *param)
{
struct pw_proxy *proxy = object;
struct pw_proxy *proxy = data;
struct spa_pod_builder *b;
b = pw_protocol_native_begin_proxy(proxy,
@ -2621,11 +2621,11 @@ static void session_proxy_marshal_param (void *object, int seq, uint32_t id,
pw_protocol_native_end_proxy(proxy, b);
}
static void session_resource_marshal_param (void *object, int seq, uint32_t id,
static void session_resource_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,
@ -2771,10 +2771,10 @@ static int session_resource_marshal_set_param(void *object,
return pw_protocol_native_end_resource(resource, b);
}
static int session_proxy_demarshal_info(void *object,
static int session_proxy_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;
struct spa_dict props = SPA_DICT_INIT(NULL, 0);
@ -2788,10 +2788,10 @@ static int session_proxy_demarshal_info(void *object,
info, 0, &info);
}
static int session_resource_demarshal_info(void *object,
static int session_resource_demarshal_info(void *data,
const struct pw_protocol_native_message *msg)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_parser prs;
struct spa_pod_frame f;
struct spa_dict props = SPA_DICT_INIT(NULL, 0);
@ -2805,10 +2805,10 @@ static int session_resource_demarshal_info(void *object,
info, 0, &info);
}
static int session_proxy_demarshal_param(void *object,
static int session_proxy_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;
@ -2827,10 +2827,10 @@ static int session_proxy_demarshal_param(void *object,
param, 0, seq, id, index, next, param);
}
static int session_resource_demarshal_param(void *object,
static int session_resource_demarshal_param(void *data,
const struct pw_protocol_native_message *msg)
{
struct pw_resource *resource = object;
struct pw_resource *resource = data;
struct spa_pod_parser prs;
uint32_t id, index, next;
int seq;

12
src/modules/module-session-manager/session.c
View file

@ -174,10 +174,10 @@ static const struct pw_session_methods session_methods = {
.set_param = method_set_param,
};
static int global_bind(void *_data, struct pw_impl_client *client,
static int global_bind(void *object, struct pw_impl_client *client,
uint32_t permissions, uint32_t version, uint32_t id)
{
struct impl *impl = _data;
struct impl *impl = object;
struct pw_resource *resource;
struct resource_data *data;
@ -274,9 +274,9 @@ static int emit_info(void *data, struct pw_resource *resource)
return 0;
}
static void event_info(void *object, const struct pw_session_info *info)
static void event_info(void *data, const struct pw_session_info *info)
{
struct impl *impl = object;
struct impl *impl = data;
uint32_t changed_ids[MAX_PARAMS], n_changed_ids = 0;
uint32_t i;
@ -339,11 +339,11 @@ static int emit_param(void *_data, struct pw_resource *resource)
return 0;
}
static void event_param(void *object, int seq,
static void event_param(void *data, int seq,
uint32_t id, uint32_t index, uint32_t next,
const struct spa_pod *param)
{
struct impl *impl = object;
struct impl *impl = data;
struct param_data *pdata;
struct spa_pod **pod;
struct param_event_args args = { id, index, next, param };