mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-11-04 13:30:12 -05:00
Cleanup argument names in methods and events interfaces
First method argument is object, first event argument is data. Closes !963
This commit is contained in:
parent
d3ea3142e1
commit
22fc9eec35
55 changed files with 636 additions and 636 deletions
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue