mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-01 22:58:50 -04: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

20
src/tests/test-endpoint.c
View file

@ -267,9 +267,9 @@ struct test_endpoint_data
};
static void
endpoint_event_info(void *object, const struct pw_endpoint_info *info)
endpoint_event_info(void *data, const struct pw_endpoint_info *info)
{
struct test_endpoint_data *d = object;
struct test_endpoint_data *d = data;
const char *val;
spa_assert_se(info);
@ -299,11 +299,11 @@ endpoint_event_info(void *object, const struct pw_endpoint_info *info)
}
static void
endpoint_event_param(void *object, int seq,
endpoint_event_param(void *data, int seq,
uint32_t id, uint32_t index, uint32_t next,
const struct spa_pod *param)
{
struct test_endpoint_data *d = object;
struct test_endpoint_data *d = data;
if (id == SPA_PARAM_Props) {
struct props *p = &d->props;
@ -326,9 +326,9 @@ static const struct pw_endpoint_events endpoint_events = {
};
static void
endpoint_proxy_destroy(void *object)
endpoint_proxy_destroy(void *data)
{
struct test_endpoint_data *d = object;
struct test_endpoint_data *d = data;
d->bound_proxy = NULL;
pw_main_loop_quit(d->loop);
}
@ -339,11 +339,11 @@ static const struct pw_proxy_events proxy_events = {
};
static void
test_endpoint_global(void *object, uint32_t id,
test_endpoint_global(void *data, uint32_t id,
uint32_t permissions, const char *type, uint32_t version,
const struct spa_dict *props)
{
struct test_endpoint_data *d = object;
struct test_endpoint_data *d = data;
const char *val;
if (!spa_streq(type, PW_TYPE_INTERFACE_Endpoint))
@ -366,9 +366,9 @@ test_endpoint_global(void *object, uint32_t id,
}
static void
test_endpoint_global_remove(void *object, uint32_t id)
test_endpoint_global_remove(void *data, uint32_t id)
{
struct test_endpoint_data *d = object;
struct test_endpoint_data *d = data;
if (d->bound_proxy && id == pw_proxy_get_bound_id(d->bound_proxy))
pw_proxy_destroy(d->bound_proxy);
}

42
src/tests/test-interfaces.c
View file

@ -54,14 +54,14 @@ static void test_core_abi(void)
} methods = { PW_VERSION_CORE_METHODS, };
static const struct {
uint32_t version;
void (*info) (void *object, const struct pw_core_info *info);
void (*done) (void *object, uint32_t id, int seq);
void (*ping) (void *object, uint32_t id, int seq);
void (*error) (void *object, uint32_t id, int seq, int res, const char *error);
void (*remove_id) (void *object, uint32_t id);
void (*bound_id) (void *object, uint32_t id, uint32_t global_id);
void (*add_mem) (void *object, uint32_t id, uint32_t type, int fd, uint32_t flags);
void (*remove_mem) (void *object, uint32_t id);
void (*info) (void *data, const struct pw_core_info *info);
void (*done) (void *data, uint32_t id, int seq);
void (*ping) (void *data, uint32_t id, int seq);
void (*error) (void *data, uint32_t id, int seq, int res, const char *error);
void (*remove_id) (void *data, uint32_t id);
void (*bound_id) (void *data, uint32_t id, uint32_t global_id);
void (*add_mem) (void *data, uint32_t id, uint32_t type, int fd, uint32_t flags);
void (*remove_mem) (void *data, uint32_t id);
} events = { PW_VERSION_CORE_EVENTS, };
struct pw_core_events e;
@ -108,10 +108,10 @@ static void test_registry_abi(void)
} methods = { PW_VERSION_REGISTRY_METHODS, };
struct {
uint32_t version;
void (*global) (void *object, uint32_t id,
void (*global) (void *data, uint32_t id,
uint32_t permissions, const char *type, uint32_t version,
const struct spa_dict *props);
void (*global_remove) (void *object, uint32_t id);
void (*global_remove) (void *data, uint32_t id);
} events = { PW_VERSION_REGISTRY_EVENTS, };
TEST_FUNC(m, methods, version);
@ -141,7 +141,7 @@ static void test_module_abi(void)
} methods = { PW_VERSION_MODULE_METHODS, };
struct {
uint32_t version;
void (*info) (void *object, const struct pw_module_info *info);
void (*info) (void *data, const struct pw_module_info *info);
} events = { PW_VERSION_MODULE_EVENTS, };
TEST_FUNC(m, methods, version);
@ -174,8 +174,8 @@ static void test_device_abi(void)
} methods = { PW_VERSION_DEVICE_METHODS, };
struct {
uint32_t version;
void (*info) (void *object, const struct pw_device_info *info);
void (*param) (void *object, int seq,
void (*info) (void *data, const struct pw_device_info *info);
void (*param) (void *data, int seq,
uint32_t id, uint32_t index, uint32_t next,
const struct spa_pod *param);
} events = { PW_VERSION_DEVICE_EVENTS, };
@ -214,8 +214,8 @@ static void test_node_abi(void)
} methods = { PW_VERSION_NODE_METHODS, };
struct {
uint32_t version;
void (*info) (void *object, const struct pw_node_info *info);
void (*param) (void *object, int seq,
void (*info) (void *data, const struct pw_node_info *info);
void (*param) (void *data, int seq,
uint32_t id, uint32_t index, uint32_t next,
const struct spa_pod *param);
} events = { PW_VERSION_NODE_EVENTS, };
@ -252,8 +252,8 @@ static void test_port_abi(void)
} methods = { PW_VERSION_PORT_METHODS, };
struct {
uint32_t version;
void (*info) (void *object, const struct pw_port_info *info);
void (*param) (void *object, int seq,
void (*info) (void *data, const struct pw_port_info *info);
void (*param) (void *data, int seq,
uint32_t id, uint32_t index, uint32_t next,
const struct spa_pod *param);
} events = { PW_VERSION_PORT_EVENTS, };
@ -284,7 +284,7 @@ static void test_factory_abi(void)
} methods = { PW_VERSION_FACTORY_METHODS, };
struct {
uint32_t version;
void (*info) (void *object, const struct pw_factory_info *info);
void (*info) (void *data, const struct pw_factory_info *info);
} events = { PW_VERSION_FACTORY_EVENTS, };
TEST_FUNC(m, methods, version);
@ -316,8 +316,8 @@ static void test_client_abi(void)
} methods = { PW_VERSION_CLIENT_METHODS, };
struct {
uint32_t version;
void (*info) (void *object, const struct pw_client_info *info);
void (*permissions) (void *object, uint32_t index,
void (*info) (void *data, const struct pw_client_info *info);
void (*permissions) (void *data, uint32_t index,
uint32_t n_permissions, const struct pw_permission *permissions);
} events = { PW_VERSION_CLIENT_EVENTS, };
@ -350,7 +350,7 @@ static void test_link_abi(void)
} methods = { PW_VERSION_LINK_METHODS, };
struct {
uint32_t version;
void (*info) (void *object, const struct pw_link_info *info);
void (*info) (void *data, const struct pw_link_info *info);
} events = { PW_VERSION_LINK_EVENTS, };
TEST_FUNC(m, methods, version);