hook: separate spa_callbacks from the hook

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

View file

@ -48,7 +48,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;
@ -283,7 +283,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)

View file

@ -134,7 +134,7 @@ struct impl {
struct props props;
struct spa_hook_list hooks;
struct spa_hook callbacks;
struct spa_callbacks callbacks;
struct port out_ports[1];
@ -383,7 +383,7 @@ static int impl_node_set_callbacks(struct spa_node *node,
this = SPA_CONTAINER_OF(node, struct impl, node);
this->callbacks = SPA_HOOK_INIT(callbacks, data);
this->callbacks = SPA_CALLBACKS_INIT(callbacks, data);
return 0;
}