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

cleanups

Browse source 
Follow the data/size argument order convention to make the api
more consistent.
This commit is contained in:
Wim Taymans 2017-11-20 15:26:44 +01:00
parent 7f931464e8
commit 5bebfe022b
50 changed files with 253 additions and 252 deletions
Download patch file Download diff file Expand all files Collapse all files

22
spa/plugins/alsa/alsa-sink.c
View file

@ -128,7 +128,7 @@ static int impl_node_set_param(struct spa_node *node, uint32_t id, uint32_t flag
return 0;
}
static int do_send_done(struct spa_loop *loop, bool async, uint32_t seq, size_t size, const void *data, void *user_data)
static int do_send_done(struct spa_loop *loop, bool async, uint32_t seq, const void *data, size_t size, void *user_data)
{
struct state *this = user_data;
@ -137,7 +137,7 @@ static int do_send_done(struct spa_loop *loop, bool async, uint32_t seq, size_t
return 0;
}
static int do_command(struct spa_loop *loop, bool async, uint32_t seq, size_t size, const void *data, void *user_data)
static int do_command(struct spa_loop *loop, bool async, uint32_t seq, const void *data, size_t size, void *user_data)
{
struct state *this = user_data;
int res;
@ -153,8 +153,8 @@ static int do_command(struct spa_loop *loop, bool async, uint32_t seq, size_t si
spa_loop_invoke(this->main_loop,
do_send_done,
seq,
sizeof(res),
&res,
sizeof(res),
false,
this);
}
@ -180,8 +180,8 @@ static int impl_node_send_command(struct spa_node *node, const struct spa_comman
return spa_loop_invoke(this->data_loop,
do_command,
++this->seq,
SPA_POD_SIZE(command),
command,
SPA_POD_SIZE(command),
false,
this);
@ -229,14 +229,14 @@ impl_node_get_n_ports(struct spa_node *node,
static int
impl_node_get_port_ids(struct spa_node *node,
uint32_t n_input_ports,
uint32_t *input_ids,
uint32_t n_output_ports,
uint32_t *output_ids)
uint32_t n_input_ids,
uint32_t *output_ids,
uint32_t n_output_ids)
{
spa_return_val_if_fail(node != NULL, -EINVAL);
if (n_input_ports > 0 && input_ids != NULL)
if (n_input_ids > 0 && input_ids != NULL)
input_ids[0] = 0;
return 0;
@ -600,8 +600,8 @@ static const struct spa_dict_item node_info_items[] = {
};
static const struct spa_dict node_info = {
SPA_N_ELEMENTS(node_info_items),
node_info_items
node_info_items,
SPA_N_ELEMENTS(node_info_items)
};
static const struct spa_node impl_node = {
@ -732,8 +732,8 @@ static const struct spa_dict_item info_items[] = {
};
static const struct spa_dict info = {
info_items,
SPA_N_ELEMENTS(info_items),
info_items
};
const struct spa_handle_factory spa_alsa_sink_factory = {

30
spa/plugins/alsa/alsa-source.c
View file

@ -125,7 +125,7 @@ static int impl_node_set_param(struct spa_node *node, uint32_t id, uint32_t flag
return 0;
}
static int do_send_done(struct spa_loop *loop, bool async, uint32_t seq, size_t size, const void *data, void *user_data)
static int do_send_done(struct spa_loop *loop, bool async, uint32_t seq, const void *data, size_t size, void *user_data)
{
struct state *this = user_data;
@ -134,7 +134,7 @@ static int do_send_done(struct spa_loop *loop, bool async, uint32_t seq, size_t
return 0;
}
static int do_start(struct spa_loop *loop, bool async, uint32_t seq, size_t size, const void *data, void *user_data)
static int do_start(struct spa_loop *loop, bool async, uint32_t seq, const void *data, size_t size, void *user_data)
{
struct state *this = user_data;
int res;
@ -145,15 +145,15 @@ static int do_start(struct spa_loop *loop, bool async, uint32_t seq, size_t size
spa_loop_invoke(this->main_loop,
do_send_done,
seq,
sizeof(res),
&res,
sizeof(res),
false,
this);
}
return res;
}
static int do_pause(struct spa_loop *loop, bool async, uint32_t seq, size_t size, const void *data, void *user_data)
static int do_pause(struct spa_loop *loop, bool async, uint32_t seq, const void *data, size_t size, void *user_data)
{
struct state *this = user_data;
int res;
@ -164,8 +164,8 @@ static int do_pause(struct spa_loop *loop, bool async, uint32_t seq, size_t size
spa_loop_invoke(this->main_loop,
do_send_done,
seq,
sizeof(res),
&res,
sizeof(res),
false,
this);
}
@ -187,14 +187,14 @@ static int impl_node_send_command(struct spa_node *node, const struct spa_comman
if (this->n_buffers == 0)
return -EIO;
return spa_loop_invoke(this->data_loop, do_start, ++this->seq, 0, NULL, false, this);
return spa_loop_invoke(this->data_loop, do_start, ++this->seq, NULL, 0, false, this);
} else if (SPA_COMMAND_TYPE(command) == this->type.command_node.Pause) {
if (!this->have_format)
return -EIO;
if (this->n_buffers == 0)
return -EIO;
return spa_loop_invoke(this->data_loop, do_pause, ++this->seq, 0, NULL, false, this);
return spa_loop_invoke(this->data_loop, do_pause, ++this->seq, NULL, 0, false, this);
} else
return -ENOTSUP;
@ -241,14 +241,14 @@ impl_node_get_n_ports(struct spa_node *node,
static int
impl_node_get_port_ids(struct spa_node *node,
uint32_t n_input_ports,
uint32_t *input_ids,
uint32_t n_output_ports,
uint32_t *output_ids)
uint32_t n_input_ids,
uint32_t *output_ids,
uint32_t n_output_ids)
{
spa_return_val_if_fail(node != NULL, -EINVAL);
if (n_output_ports > 0 && output_ids != NULL)
if (n_output_ids > 0 && output_ids != NULL)
output_ids[0] = 0;
return 0;
@ -642,8 +642,8 @@ static const struct spa_dict_item node_info_items[] = {
};
static const struct spa_dict node_info = {
SPA_N_ELEMENTS(node_info_items),
node_info_items
node_info_items,
SPA_N_ELEMENTS(node_info_items)
};
static const struct spa_node impl_node = {
@ -823,8 +823,8 @@ static const struct spa_dict_item info_items[] = {
};
static const struct spa_dict info = {
SPA_N_ELEMENTS(info_items),
info_items
info_items,
SPA_N_ELEMENTS(info_items)
};
const struct spa_handle_factory spa_alsa_source_factory = {

4
spa/plugins/alsa/alsa-utils.c
View file

@ -688,8 +688,8 @@ int spa_alsa_start(struct state *state, bool xrun_recover)
static int do_remove_source(struct spa_loop *loop,
bool async,
uint32_t seq,
size_t size,
const void *data,
size_t size,
void *user_data)
{
struct state *state = user_data;
@ -706,7 +706,7 @@ int spa_alsa_pause(struct state *state, bool xrun_recover)
spa_log_trace(state->log, "alsa %p: pause", state);
spa_loop_invoke(state->data_loop, do_remove_source, 0, 0, NULL, true, state);
spa_loop_invoke(state->data_loop, do_remove_source, 0, NULL, 0, true, state);
if ((err = snd_pcm_drop(state->hndl)) < 0)
spa_log_error(state->log, "snd_pcm_drop %s", snd_strerror(err));

10
spa/plugins/audiomixer/audiomixer.c
View file

@ -209,10 +209,10 @@ impl_node_get_n_ports(struct spa_node *node,
static int
impl_node_get_port_ids(struct spa_node *node,
uint32_t n_input_ports,
uint32_t *input_ids,
uint32_t n_output_ports,
uint32_t *output_ids)
uint32_t n_input_ids,
uint32_t *output_ids,
uint32_t n_output_ids)
{
struct impl *this;
int i, idx;
@ -222,12 +222,12 @@ impl_node_get_port_ids(struct spa_node *node,
this = SPA_CONTAINER_OF(node, struct impl, node);
if (input_ids) {
for (i = 0, idx = 0; i < this->last_port && idx < n_input_ports; i++) {
for (i = 0, idx = 0; i < this->last_port && idx < n_input_ids; i++) {
if (this->in_ports[i].valid)
input_ids[idx++] = i;
}
}
if (n_output_ports > 0 && output_ids)
if (n_output_ids > 0 && output_ids)
output_ids[0] = 0;
return 0;

16
spa/plugins/audiotestsrc/audiotestsrc.c
View file

@ -462,14 +462,14 @@ impl_node_get_n_ports(struct spa_node *node,
static int
impl_node_get_port_ids(struct spa_node *node,
uint32_t n_input_ports,
uint32_t *input_ids,
uint32_t n_output_ports,
uint32_t *output_ids)
uint32_t n_input_ids,
uint32_t *output_ids,
uint32_t n_output_ids)
{
spa_return_val_if_fail(node != NULL, -EINVAL);
if (n_output_ports > 0 && output_ids != NULL)
if (n_output_ids > 0 && output_ids != NULL)
output_ids[0] = 0;
return 0;
@ -897,8 +897,8 @@ static const struct spa_dict_item node_info_items[] = {
};
static const struct spa_dict node_info = {
SPA_N_ELEMENTS(node_info_items),
node_info_items
node_info_items,
SPA_N_ELEMENTS(node_info_items)
};
static const struct spa_node impl_node = {
@ -1096,8 +1096,8 @@ static const struct spa_dict_item info_items[] = {
};
static const struct spa_dict info = {
SPA_N_ELEMENTS(info_items),
info_items
info_items,
SPA_N_ELEMENTS(info_items)
};
const struct spa_handle_factory spa_audiotestsrc_factory = {

10
spa/plugins/ffmpeg/ffmpeg-dec.c
View file

@ -161,17 +161,17 @@ spa_ffmpeg_dec_node_get_n_ports(struct spa_node *node,
static int
spa_ffmpeg_dec_node_get_port_ids(struct spa_node *node,
uint32_t n_input_ports,
uint32_t *input_ids,
uint32_t n_output_ports,
uint32_t *output_ids)
uint32_t n_input_ids,
uint32_t *output_ids,
uint32_t n_output_ids)
{
if (node == NULL)
return -EINVAL;
if (n_input_ports > 0 && input_ids != NULL)
if (n_input_ids > 0 && input_ids != NULL)
input_ids[0] = 0;
if (n_output_ports > 0 && output_ids != NULL)
if (n_output_ids > 0 && output_ids != NULL)
output_ids[0] = 0;
return 0;

10
spa/plugins/ffmpeg/ffmpeg-enc.c
View file

@ -164,17 +164,17 @@ spa_ffmpeg_enc_node_get_n_ports(struct spa_node *node,
static int
spa_ffmpeg_enc_node_get_port_ids(struct spa_node *node,
uint32_t n_input_ports,
uint32_t *input_ids,
uint32_t n_output_ports,
uint32_t *output_ids)
uint32_t n_input_ids,
uint32_t *output_ids,
uint32_t n_output_ids)
{
if (node == NULL)
return -EINVAL;
if (n_input_ports > 0 && input_ids != NULL)
if (n_input_ids > 0 && input_ids != NULL)
input_ids[0] = 0;
if (n_output_ports > 0 && output_ids != NULL)
if (n_output_ids > 0 && output_ids != NULL)
output_ids[0] = 0;
return 0;

8
spa/plugins/support/loop.c
View file

@ -46,8 +46,8 @@ struct invoke_item {
size_t item_size;
spa_invoke_func_t func;
uint32_t seq;
size_t size;
void *data;
size_t size;
bool block;
void *user_data;
int res;
@ -195,8 +195,8 @@ static int
loop_invoke(struct spa_loop *loop,
spa_invoke_func_t func,
uint32_t seq,
size_t size,
const void *data,
size_t size,
bool block,
void *user_data)
{
@ -206,7 +206,7 @@ loop_invoke(struct spa_loop *loop,
int res;
if (in_thread) {
res = func(loop, false, seq, size, data, user_data);
res = func(loop, false, seq, data, size, user_data);
} else {
int32_t filled, avail;
uint32_t idx, offset, l0;
@ -273,7 +273,7 @@ static void wakeup_func(void *data, uint64_t count)
while (spa_ringbuffer_get_read_index(&impl->buffer, &index) > 0) {
struct invoke_item *item =
SPA_MEMBER(impl->buffer_data, index & (DATAS_SIZE - 1), struct invoke_item);
item->res = item->func(&impl->loop, true, item->seq, item->size, item->data,
item->res = item->func(&impl->loop, true, item->seq, item->data, item->size,
item->user_data);
spa_ringbuffer_read_update(&impl->buffer, index + item->item_size);

8
spa/plugins/test/fakesink.c
View file

@ -385,14 +385,14 @@ impl_node_get_n_ports(struct spa_node *node,
static int
impl_node_get_port_ids(struct spa_node *node,
uint32_t n_input_ports,
uint32_t *input_ids,
uint32_t n_output_ports,
uint32_t *output_ids)
uint32_t n_input_ids,
uint32_t *output_ids,
uint32_t n_output_ids)
{
spa_return_val_if_fail(node != NULL, -EINVAL);
if (n_input_ports > 0 && input_ids != NULL)
if (n_input_ids > 0 && input_ids != NULL)
input_ids[0] = 0;
return 0;

8
spa/plugins/test/fakesrc.c
View file

@ -401,14 +401,14 @@ impl_node_get_n_ports(struct spa_node *node,
static int
impl_node_get_port_ids(struct spa_node *node,
uint32_t n_input_ports,
uint32_t *input_ids,
uint32_t n_output_ports,
uint32_t *output_ids)
uint32_t n_input_ids,
uint32_t *output_ids,
uint32_t n_output_ids)
{
spa_return_val_if_fail(node != NULL, -EINVAL);
if (n_output_ports > 0 && output_ids != NULL)
if (n_output_ids > 0 && output_ids != NULL)
output_ids[0] = 0;
return 0;

28
spa/plugins/v4l2/v4l2-source.c
View file

@ -251,8 +251,8 @@ static int impl_node_set_param(struct spa_node *node,
static int do_pause_done(struct spa_loop *loop,
bool async,
uint32_t seq,
size_t size,
const void *data,
size_t size,
void *user_data)
{
struct impl *this = user_data;
@ -269,8 +269,8 @@ static int do_pause_done(struct spa_loop *loop,
static int do_pause(struct spa_loop *loop,
bool async,
uint32_t seq,
size_t size,
const void *data,
size_t size,
void *user_data)
{
struct impl *this = user_data;
@ -283,8 +283,8 @@ static int do_pause(struct spa_loop *loop,
spa_loop_invoke(this->out_ports[0].main_loop,
do_pause_done,
seq,
sizeof(res),
&res,
sizeof(res),
false,
this);
}
@ -294,8 +294,8 @@ static int do_pause(struct spa_loop *loop,
static int do_start_done(struct spa_loop *loop,
bool async,
uint32_t seq,
size_t size,
const void *data,
size_t size,
void *user_data)
{
struct impl *this = user_data;
@ -309,8 +309,8 @@ static int do_start_done(struct spa_loop *loop,
static int do_start(struct spa_loop *loop,
bool async,
uint32_t seq,
size_t size,
const void *data,
size_t size,
void *user_data)
{
struct impl *this = user_data;
@ -323,8 +323,8 @@ static int do_start(struct spa_loop *loop,
spa_loop_invoke(this->out_ports[0].main_loop,
do_start_done,
seq,
sizeof(res),
&res,
sizeof(res),
false,
this);
}
@ -355,8 +355,8 @@ static int impl_node_send_command(struct spa_node *node, const struct spa_comman
return spa_loop_invoke(this->out_ports[0].data_loop,
do_start,
++this->seq,
SPA_POD_SIZE(command),
command,
SPA_POD_SIZE(command),
false,
this);
} else if (SPA_COMMAND_TYPE(command) == this->type.command_node.Pause) {
@ -370,8 +370,8 @@ static int impl_node_send_command(struct spa_node *node, const struct spa_comman
return spa_loop_invoke(this->out_ports[0].data_loop,
do_pause,
++this->seq,
SPA_POD_SIZE(command),
command,
SPA_POD_SIZE(command),
false,
this);
} else if (SPA_COMMAND_TYPE(command) == this->type.command_node.ClockUpdate) {
@ -418,14 +418,14 @@ impl_node_get_n_ports(struct spa_node *node,
}
static int impl_node_get_port_ids(struct spa_node *node,
uint32_t n_input_ports,
uint32_t *input_ids,
uint32_t n_output_ports,
uint32_t *output_ids)
uint32_t n_input_ids,
uint32_t *output_ids,
uint32_t n_output_ids)
{
spa_return_val_if_fail(node != NULL, -EINVAL);
if (n_output_ports > 0 && output_ids != NULL)
if (n_output_ids > 0 && output_ids != NULL)
output_ids[0] = 0;
return 0;
@ -854,8 +854,8 @@ static const struct spa_dict_item info_items[] = {
};
static const struct spa_dict info = {
SPA_N_ELEMENTS(info_items),
info_items
info_items,
SPA_N_ELEMENTS(info_items)
};
static const struct spa_node impl_node = {

14
spa/plugins/videotestsrc/videotestsrc.c
View file

@ -411,14 +411,14 @@ impl_node_get_n_ports(struct spa_node *node,
static int
impl_node_get_port_ids(struct spa_node *node,
uint32_t n_input_ports,
uint32_t *input_ids,
uint32_t n_output_ports,
uint32_t *output_ids)
uint32_t n_input_ids,
uint32_t *output_ids,
uint32_t n_output_ids)
{
spa_return_val_if_fail(node != NULL, -EINVAL);
if (n_output_ports > 0 && output_ids != NULL)
if (n_output_ids > 0 && output_ids != NULL)
output_ids[0] = 0;
return 0;
@ -841,8 +841,8 @@ static const struct spa_dict_item node_info_items[] = {
};
static const struct spa_dict node_info = {
node_info_items,
SPA_N_ELEMENTS(node_info_items),
node_info_items
};
static const struct spa_node impl_node = {
@ -1040,8 +1040,8 @@ static const struct spa_dict_item info_items[] = {
};
static const struct spa_dict info = {
SPA_N_ELEMENTS(info_items),
info_items
info_items,
SPA_N_ELEMENTS(info_items)
};
const struct spa_handle_factory spa_videotestsrc_factory = {

10
spa/plugins/volume/volume.c
View file

@ -277,16 +277,16 @@ impl_node_get_n_ports(struct spa_node *node,
static int
impl_node_get_port_ids(struct spa_node *node,
uint32_t n_input_ports,
uint32_t *input_ids,
uint32_t n_output_ports,
uint32_t *output_ids)
uint32_t n_input_ids,
uint32_t *output_ids,
uint32_t n_output_ids)
{
spa_return_val_if_fail(node != NULL, -EINVAL);
if (n_input_ports > 0 && input_ids)
if (n_input_ids > 0 && input_ids)
input_ids[0] = 0;
if (n_output_ports > 0 && output_ids)
if (n_output_ids > 0 && output_ids)
output_ids[0] = 0;
return 0;