mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

event: make events dynamic

Browse source 
Use uri for the events.
This commit is contained in:
Wim Taymans 2017-03-21 20:39:20 +01:00
parent 5bccb1aeea
commit 4d9f2c5161
23 changed files with 299 additions and 285 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -70,6 +70,7 @@ typedef struct {
SpaMediaSubtypesVideo media_subtypes_video;
SpaPropVideo prop_video;
SpaVideoFormats video_formats;
SpaNodeEvents node_events;
} URI;
typedef struct {
@ -232,7 +233,7 @@ do_pause_done (SpaLoop *loop,
state->started = false;
update_state (this, SPA_NODE_STATE_PAUSED);
}
this->event_cb (&this->node, (SpaNodeEvent *)ac, this->user_data);
this->event_cb (&this->node, (SpaEvent *)ac, this->user_data);
return SPA_RESULT_OK;
}
@ -255,7 +256,8 @@ do_pause (SpaLoop *loop,
cmd);
if (async) {
SpaNodeEventAsyncComplete ac = SPA_NODE_EVENT_ASYNC_COMPLETE_INIT (seq, res);
SpaNodeEventAsyncComplete ac = SPA_NODE_EVENT_ASYNC_COMPLETE_INIT (this->uri.node_events.AsyncComplete,
seq, res);
spa_loop_invoke (this->state[0].main_loop,
do_pause_done,
seq,
@ -282,7 +284,7 @@ do_start_done (SpaLoop *loop,
state->started = true;
update_state (this, SPA_NODE_STATE_STREAMING);
}
this->event_cb (&this->node, (SpaNodeEvent *)ac, this->user_data);
this->event_cb (&this->node, (SpaEvent *)ac, this->user_data);
return SPA_RESULT_OK;
}
@ -305,7 +307,8 @@ do_start (SpaLoop *loop,
cmd);
if (async) {
SpaNodeEventAsyncComplete ac = SPA_NODE_EVENT_ASYNC_COMPLETE_INIT (seq, res);
SpaNodeEventAsyncComplete ac = SPA_NODE_EVENT_ASYNC_COMPLETE_INIT (this->uri.node_events.AsyncComplete,
seq, res);
spa_loop_invoke (this->state[0].main_loop,
do_start_done,
seq,
@ -974,6 +977,7 @@ v4l2_source_init (const SpaHandleFactory *factory,
spa_media_subtypes_video_map (this->map, &this->uri.media_subtypes_video);
spa_prop_video_map (this->map, &this->uri.prop_video);
spa_video_formats_map (this->map, &this->uri.video_formats);
spa_node_events_map (this->map, &this->uri.node_events);
this->node = v4l2source_node;
this->clock = v4l2source_clock;

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

@ -979,7 +979,7 @@ v4l2_on_fd_events (SpaSource *source)
return;
{
SpaNodeEvent event = SPA_NODE_EVENT_INIT (SPA_NODE_EVENT_HAVE_OUTPUT);
SpaEvent event = SPA_EVENT_INIT (this->uri.node_events.HaveOutput);
this->event_cb (&this->node, &event, this->user_data);
}
}