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

hook: separate spa_callbacks from the hook

Browse source 
Make a spa_callbacks with just the functions and data and use this
in the hook and objects.
This commit is contained in:
Wim Taymans 2019-05-15 12:17:52 +02:00
parent 6ee192dff5
commit 448c1937ad
28 changed files with 97 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -51,7 +51,7 @@ struct impl {
struct spa_log *log;
struct spa_loop *main_loop;
struct spa_hook callbacks;
struct spa_callbacks callbacks;
struct udev *udev;
struct udev_monitor *umonitor;
@ -377,7 +377,7 @@ impl_monitor_set_callbacks(struct spa_monitor *monitor,
this = SPA_CONTAINER_OF(monitor, struct impl, monitor);
this->callbacks = SPA_HOOK_INIT(callbacks, data);
this->callbacks = SPA_CALLBACKS_INIT(callbacks, data);
if (callbacks) {
if ((res = impl_udev_open(this)) < 0)

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

@ -293,7 +293,7 @@ impl_node_set_callbacks(struct spa_node *node,
this = SPA_CONTAINER_OF(node, struct state, node);
this->callbacks = SPA_HOOK_INIT(callbacks, data);
this->callbacks = SPA_CALLBACKS_INIT(callbacks, data);
return 0;
}

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

@ -292,7 +292,7 @@ impl_node_set_callbacks(struct spa_node *node,
this = SPA_CONTAINER_OF(node, struct state, node);
this->callbacks = SPA_HOOK_INIT(callbacks, data);
this->callbacks = SPA_CALLBACKS_INIT(callbacks, data);
return 0;
}

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

@ -82,7 +82,7 @@ struct state {
snd_output_t *output;
struct spa_hook_list hooks;
struct spa_hook callbacks;
struct spa_callbacks callbacks;
uint64_t info_all;
struct spa_node_info info;