mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-05 13:30:02 -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

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);