mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add user_data to callbacks

Browse source 
Add user data to callbacks, it's more flexible and natural
This commit is contained in:
Wim Taymans 2017-06-18 19:48:31 +02:00
parent 59ec32c039
commit 763bd1100e
27 changed files with 156 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

7
spa/plugins/alsa/alsa-monitor.c
View file

@ -59,6 +59,7 @@ struct impl {
struct spa_loop *main_loop;
const struct spa_monitor_callbacks *callbacks;
void *user_data;
struct udev *udev;
struct udev_monitor *umonitor;
@ -349,14 +350,15 @@ static void impl_on_fd_events(struct spa_source *source)
spa_pod_builder_object(&b, &f[0], 0, type, SPA_POD_TYPE_POD, this->item);
event = SPA_POD_BUILDER_DEREF(&b, f[0].ref, struct spa_event);
this->callbacks->event(this->callbacks, &this->monitor, event);
this->callbacks->event(&this->monitor, event, this->user_data);
}
close_card(this);
}
static int
impl_monitor_set_callbacks(struct spa_monitor *monitor,
const struct spa_monitor_callbacks *callbacks)
const struct spa_monitor_callbacks *callbacks,
void *user_data)
{
int res;
struct impl *this;
@ -366,6 +368,7 @@ impl_monitor_set_callbacks(struct spa_monitor *monitor,
this = SPA_CONTAINER_OF(monitor, struct impl, monitor);
this->callbacks = callbacks;
this->user_data = user_data;
if (callbacks) {
if ((res = impl_udev_open(this)) < 0)

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

@ -92,7 +92,7 @@ static int do_send_done(struct spa_loop *loop, bool async, uint32_t seq, size_t
{
struct state *this = user_data;
this->callbacks->done(this->callbacks, &this->node, seq, *(int*)data);
this->callbacks->done(&this->node, seq, *(int*)data, this->user_data);
return SPA_RESULT_OK;
}
@ -150,7 +150,8 @@ static int impl_node_send_command(struct spa_node *node, struct spa_command *com
static int
impl_node_set_callbacks(struct spa_node *node,
const struct spa_node_callbacks *callbacks)
const struct spa_node_callbacks *callbacks,
void *user_data)
{
struct state *this;
@ -159,6 +160,7 @@ impl_node_set_callbacks(struct spa_node *node,
this = SPA_CONTAINER_OF(node, struct state, node);
this->callbacks = callbacks;
this->user_data = user_data;
return SPA_RESULT_OK;
}

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

@ -94,7 +94,7 @@ static int do_send_done(struct spa_loop *loop, bool async, uint32_t seq, size_t
{
struct state *this = user_data;
this->callbacks->done(this->callbacks, &this->node, seq, *(int*)data);
this->callbacks->done(&this->node, seq, *(int*)data, this->user_data);
return SPA_RESULT_OK;
}
@ -168,7 +168,8 @@ static int impl_node_send_command(struct spa_node *node, struct spa_command *com
static int
impl_node_set_callbacks(struct spa_node *node,
const struct spa_node_callbacks *callbacks)
const struct spa_node_callbacks *callbacks,
void *user_data)
{
struct state *this;
@ -177,6 +178,7 @@ impl_node_set_callbacks(struct spa_node *node,
this = SPA_CONTAINER_OF(node, struct state, node);
this->callbacks = callbacks;
this->user_data = user_data;
return SPA_RESULT_OK;
}

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

@ -324,7 +324,7 @@ pull_frames(struct state *state,
io->range.offset = state->sample_count * state->frame_size;
io->range.min_size = state->threshold * state->frame_size;
io->range.max_size = frames * state->frame_size;
state->callbacks->need_input(state->callbacks, &state->node);
state->callbacks->need_input(&state->node, state->user_data);
}
while (!spa_list_is_empty(&state->ready) && to_write > 0) {
uint8_t *src, *dst;
@ -371,10 +371,10 @@ pull_frames(struct state *state,
b->outstanding = true;
state->io->buffer_id = b->outbuf->id;
spa_log_trace(state->log, "alsa-util %p: reuse buffer %u", state, b->outbuf->id);
state->callbacks->reuse_buffer(state->callbacks,
&state->node,
state->callbacks->reuse_buffer(&state->node,
0,
b->outbuf->id);
b->outbuf->id,
state->user_data);
state->ready_offset = 0;
}
total_frames += n_frames;
@ -430,7 +430,7 @@ push_frames(struct state *state,
b->outstanding = true;
io->buffer_id = b->outbuf->id;
io->status = SPA_RESULT_HAVE_BUFFER;
state->callbacks->have_output(state->callbacks, &state->node);
state->callbacks->have_output(&state->node, state->user_data);
}
}
return total_frames;

1
spa/plugins/alsa/alsa-utils.h
View file

@ -119,6 +119,7 @@ struct state {
snd_output_t *output;
const struct spa_node_callbacks *callbacks;
void *user_data;
uint8_t props_buffer[1024];
struct props props;

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

@ -88,6 +88,7 @@ struct impl {
struct spa_log *log;
const struct spa_node_callbacks *callbacks;
void *user_data;
int port_count;
int port_queued;
@ -152,7 +153,8 @@ static int impl_node_send_command(struct spa_node *node, struct spa_command *com
static int
impl_node_set_callbacks(struct spa_node *node,
const struct spa_node_callbacks *callbacks)
const struct spa_node_callbacks *callbacks,
void *user_data)
{
struct impl *this;
@ -161,6 +163,7 @@ impl_node_set_callbacks(struct spa_node *node,
this = SPA_CONTAINER_OF(node, struct impl, node);
this->callbacks = callbacks;
this->user_data = user_data;
return SPA_RESULT_OK;
}

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

@ -123,6 +123,7 @@ struct impl {
struct props props;
const struct spa_node_callbacks *callbacks;
void *user_data;
struct spa_source timer_source;
struct itimerspec timerspec;
@ -350,7 +351,7 @@ static void on_output(struct spa_source *source)
res = make_buffer(this);
if (res == SPA_RESULT_HAVE_BUFFER)
this->callbacks->have_output(this->callbacks, &this->node);
this->callbacks->have_output(&this->node, this->user_data);
}
static int impl_node_send_command(struct spa_node *node, struct spa_command *command)
@ -404,7 +405,8 @@ static int impl_node_send_command(struct spa_node *node, struct spa_command *com
static int
impl_node_set_callbacks(struct spa_node *node,
const struct spa_node_callbacks *callbacks)
const struct spa_node_callbacks *callbacks,
void *user_data)
{
struct impl *this;
@ -417,6 +419,7 @@ impl_node_set_callbacks(struct spa_node *node,
return SPA_RESULT_ERROR;
}
this->callbacks = callbacks;
this->user_data = user_data;
return SPA_RESULT_OK;
}
@ -863,7 +866,8 @@ static int impl_node_process_output(struct spa_node *node)
this->io->buffer_id = SPA_ID_INVALID;
}
if ((this->callbacks == NULL || this->callbacks->have_output == NULL) && (io->status == SPA_RESULT_NEED_BUFFER))
if ((this->callbacks == NULL || this->callbacks->have_output == NULL) &&
(io->status == SPA_RESULT_NEED_BUFFER))
return make_buffer(this);
else
return SPA_RESULT_OK;

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

@ -72,6 +72,7 @@ struct impl {
struct spa_log *log;
const struct spa_node_callbacks *callbacks;
void *user_data;
struct port in_ports[1];
struct port out_ports[1];
@ -110,7 +111,8 @@ static int spa_ffmpeg_dec_node_send_command(struct spa_node *node, struct spa_co
static int
spa_ffmpeg_dec_node_set_callbacks(struct spa_node *node,
const struct spa_node_callbacks *callbacks)
const struct spa_node_callbacks *callbacks,
void *user_data)
{
struct impl *this;
@ -120,6 +122,7 @@ spa_ffmpeg_dec_node_set_callbacks(struct spa_node *node,
this = SPA_CONTAINER_OF(node, struct impl, node);
this->callbacks = callbacks;
this->user_data = user_data;
return SPA_RESULT_OK;
}

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

@ -76,6 +76,7 @@ struct impl {
struct spa_log *log;
const struct spa_node_callbacks *callbacks;
void *user_data;
struct port in_ports[1];
struct port out_ports[1];
@ -114,7 +115,8 @@ static int spa_ffmpeg_enc_node_send_command(struct spa_node *node, struct spa_co
static int
spa_ffmpeg_enc_node_set_callbacks(struct spa_node *node,
const struct spa_node_callbacks *callbacks)
const struct spa_node_callbacks *callbacks,
void *user_data)
{
struct impl *this;
@ -124,6 +126,7 @@ spa_ffmpeg_enc_node_set_callbacks(struct spa_node *node,
this = SPA_CONTAINER_OF(node, struct impl, node);
this->callbacks = callbacks;
this->user_data = user_data;
return SPA_RESULT_OK;
}

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

@ -92,6 +92,7 @@ struct impl {
struct props props;
const struct spa_node_callbacks *callbacks;
void *user_data;
struct spa_source timer_source;
struct itimerspec timerspec;
@ -225,7 +226,7 @@ static int consume_buffer(struct impl *this)
if (spa_list_is_empty(&this->ready)) {
io->status = SPA_RESULT_NEED_BUFFER;
if (this->callbacks->need_input)
this->callbacks->need_input(this->callbacks, &this->node);
this->callbacks->need_input(&this->node, this->user_data);
}
if (spa_list_is_empty(&this->ready)) {
spa_log_error(this->log, NAME " %p: no buffers", this);
@ -320,7 +321,8 @@ static int impl_node_send_command(struct spa_node *node, struct spa_command *com
static int
impl_node_set_callbacks(struct spa_node *node,
const struct spa_node_callbacks *callbacks)
const struct spa_node_callbacks *callbacks,
void *user_data)
{
struct impl *this;
@ -333,6 +335,7 @@ impl_node_set_callbacks(struct spa_node *node,
return SPA_RESULT_ERROR;
}
this->callbacks = callbacks;
this->user_data = user_data;
return SPA_RESULT_OK;
}

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

@ -95,6 +95,7 @@ struct impl {
struct props props;
const struct spa_node_callbacks *callbacks;
void *user_data;
struct spa_source timer_source;
struct itimerspec timerspec;
@ -278,7 +279,7 @@ static void on_output(struct spa_source *source)
res = make_buffer(this);
if (res == SPA_RESULT_HAVE_BUFFER && this->callbacks && this->callbacks->have_output)
this->callbacks->have_output(this->callbacks, &this->node);
this->callbacks->have_output(&this->node, this->user_data);
}
static int impl_node_send_command(struct spa_node *node, struct spa_command *command)
@ -332,7 +333,8 @@ static int impl_node_send_command(struct spa_node *node, struct spa_command *com
static int
impl_node_set_callbacks(struct spa_node *node,
const struct spa_node_callbacks *callbacks)
const struct spa_node_callbacks *callbacks,
void *user_data)
{
struct impl *this;
@ -345,6 +347,7 @@ impl_node_set_callbacks(struct spa_node *node,
return SPA_RESULT_ERROR;
}
this->callbacks = callbacks;
this->user_data = user_data;
return SPA_RESULT_OK;
}

7
spa/plugins/v4l2/v4l2-monitor.c
View file

@ -61,6 +61,7 @@ struct impl {
struct spa_loop *main_loop;
const struct spa_monitor_callbacks *callbacks;
void *user_data;
struct udev *udev;
struct udev_monitor *umonitor;
@ -230,12 +231,13 @@ static void impl_on_fd_events(struct spa_source *source)
spa_pod_builder_object(&b, &f[0], 0, type, SPA_POD_TYPE_POD, this->uitem.item);
event = SPA_POD_BUILDER_DEREF(&b, f[0].ref, struct spa_event);
this->callbacks->event(this->callbacks, &this->monitor, event);
this->callbacks->event(&this->monitor, event, this->user_data);
}
static int
impl_monitor_set_callbacks(struct spa_monitor *monitor,
const struct spa_monitor_callbacks *callbacks)
const struct spa_monitor_callbacks *callbacks,
void *user_data)
{
int res;
struct impl *this;
@ -245,6 +247,7 @@ impl_monitor_set_callbacks(struct spa_monitor *monitor,
this = SPA_CONTAINER_OF(monitor, struct impl, monitor);
this->callbacks = callbacks;
this->user_data = user_data;
if (callbacks) {
if ((res = impl_udev_open(this)) < 0)
return res;

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

@ -158,6 +158,7 @@ struct impl {
struct props props;
const struct spa_node_callbacks *callbacks;
void *user_data;
struct port out_ports[1];
};
@ -236,7 +237,7 @@ static int do_pause_done(struct spa_loop *loop,
if (SPA_RESULT_IS_OK(res))
res = spa_v4l2_stream_off(this);
this->callbacks->done(this->callbacks, &this->node, seq, res);
this->callbacks->done(&this->node, seq, res, this->user_data);
return SPA_RESULT_OK;
}
@ -275,7 +276,7 @@ static int do_start_done(struct spa_loop *loop,
struct impl *this = user_data;
int res = *(int*)data;
this->callbacks->done(this->callbacks, &this->node, seq, res);
this->callbacks->done(&this->node, seq, res, this->user_data);
return SPA_RESULT_OK;
}
@ -354,7 +355,8 @@ static int impl_node_send_command(struct spa_node *node, struct spa_command *com
}
static int impl_node_set_callbacks(struct spa_node *node,
const struct spa_node_callbacks *callbacks)
const struct spa_node_callbacks *callbacks,
void *user_data)
{
struct impl *this;
@ -363,6 +365,7 @@ static int impl_node_set_callbacks(struct spa_node *node,
this = SPA_CONTAINER_OF(node, struct impl, node);
this->callbacks = callbacks;
this->user_data = user_data;
return SPA_RESULT_OK;
}

2
spa/plugins/v4l2/v4l2-utils.c
View file

@ -934,7 +934,7 @@ static int mmap_read(struct impl *this)
b->outstanding = true;
io->buffer_id = b->outbuf->id;
io->status = SPA_RESULT_HAVE_BUFFER;
this->callbacks->have_output(this->callbacks, &this->node);
this->callbacks->have_output(&this->node, this->user_data);
return SPA_RESULT_OK;
}

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

@ -112,6 +112,7 @@ struct impl {
struct props props;
const struct spa_node_callbacks *callbacks;
void *user_data;
struct spa_source timer_source;
struct itimerspec timerspec;
@ -300,7 +301,7 @@ static void on_output(struct spa_source *source)
res = make_buffer(this);
if (res == SPA_RESULT_HAVE_BUFFER)
this->callbacks->have_output(this->callbacks, &this->node);
this->callbacks->have_output(&this->node, this->user_data);
}
static int impl_node_send_command(struct spa_node *node, struct spa_command *command)
@ -354,7 +355,8 @@ static int impl_node_send_command(struct spa_node *node, struct spa_command *com
static int
impl_node_set_callbacks(struct spa_node *node,
const struct spa_node_callbacks *callbacks)
const struct spa_node_callbacks *callbacks,
void *user_data)
{
struct impl *this;
@ -367,6 +369,7 @@ impl_node_set_callbacks(struct spa_node *node,
return SPA_RESULT_ERROR;
}
this->callbacks = callbacks;
this->user_data = user_data;
return SPA_RESULT_OK;
}

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

@ -109,6 +109,7 @@ struct impl {
struct props props;
const struct spa_node_callbacks *callbacks;
void *user_data;
uint8_t format_buffer[1024];
struct spa_audio_info current_format;
@ -207,7 +208,8 @@ static int impl_node_send_command(struct spa_node *node, struct spa_command *com
static int
impl_node_set_callbacks(struct spa_node *node,
const struct spa_node_callbacks *callbacks)
const struct spa_node_callbacks *callbacks,
void *user_data)
{
struct impl *this;
@ -216,6 +218,7 @@ impl_node_set_callbacks(struct spa_node *node,
this = SPA_CONTAINER_OF(node, struct impl, node);
this->callbacks = callbacks;
this->user_data = user_data;
return SPA_RESULT_OK;
}
@ -645,7 +648,7 @@ static struct spa_buffer *find_free_buffer(struct impl *this, struct port *port)
static inline void release_buffer(struct impl *this, struct spa_buffer *buffer)
{
if (this->callbacks && this->callbacks->reuse_buffer)
this->callbacks->reuse_buffer(this->callbacks, &this->node, 0, buffer->id);
this->callbacks->reuse_buffer(&this->node, 0, buffer->id, this->user_data);
}
static void do_volume(struct impl *this, struct spa_buffer *dbuf, struct spa_buffer *sbuf)