Only pass data to callbacks.
Rename some structs
Provide methods to access structs
This commit is contained in:
Wim Taymans 2017-08-06 06:42:26 +02:00
parent 1b79419554
commit 0602d76b9e
57 changed files with 716 additions and 422 deletions

View file

@ -59,7 +59,7 @@ struct impl {
struct spa_loop *main_loop;
const struct spa_monitor_callbacks *callbacks;
void *user_data;
void *callbacks_data;
struct udev *udev;
struct udev_monitor *umonitor;
@ -350,7 +350,7 @@ 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->monitor, event, this->user_data);
this->callbacks->event(this->callbacks_data, event);
}
close_card(this);
}
@ -358,7 +358,7 @@ static void impl_on_fd_events(struct spa_source *source)
static int
impl_monitor_set_callbacks(struct spa_monitor *monitor,
const struct spa_monitor_callbacks *callbacks,
void *user_data)
void *data)
{
int res;
struct impl *this;
@ -368,7 +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;
this->callbacks_data = data;
if (callbacks) {
if ((res = impl_udev_open(this)) < 0)