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 versions to structures

Browse source 
Use versions instead of size
Remove user_data from callbacks, we can simply pass the callback struct.
This commit is contained in:
Wim Taymans 2017-06-14 18:32:39 +02:00
parent 4a219e81dd
commit c3b73ba47d
45 changed files with 344 additions and 303 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -58,8 +58,7 @@ struct impl {
struct spa_log *log;
struct spa_loop *main_loop;
struct spa_monitor_callbacks callbacks;
void *user_data;
const struct spa_monitor_callbacks *callbacks;
struct udev *udev;
struct udev_monitor *umonitor;
@ -350,15 +349,14 @@ 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, &this->monitor, event);
}
close_card(this);
}
static int
impl_monitor_set_callbacks(struct spa_monitor *monitor,
const struct spa_monitor_callbacks *callbacks,
size_t callbacks_size, void *user_data)
const struct spa_monitor_callbacks *callbacks)
{
int res;
struct impl *this;
@ -367,10 +365,9 @@ impl_monitor_set_callbacks(struct spa_monitor *monitor,
this = SPA_CONTAINER_OF(monitor, struct impl, monitor);
if (callbacks) {
this->callbacks = *callbacks;
this->user_data = user_data;
this->callbacks = callbacks;
if (callbacks) {
if ((res = impl_udev_open(this)) < 0)
return res;
@ -389,7 +386,6 @@ impl_monitor_set_callbacks(struct spa_monitor *monitor,
spa_loop_add_source(this->main_loop, &this->source);
} else {
spa_zero(this->callbacks);
spa_loop_remove_source(this->main_loop, &this->source);
}
@ -454,8 +450,8 @@ static int impl_monitor_enum_items(struct spa_monitor *monitor,
}
static const struct spa_monitor impl_monitor = {
SPA_VERSION_MONITOR,
NULL,
sizeof(struct spa_monitor),
impl_monitor_set_callbacks,
impl_monitor_enum_items,
};
@ -542,6 +538,7 @@ impl_enum_interface_info(const struct spa_handle_factory *factory,
}
const struct spa_handle_factory spa_alsa_monitor_factory = {
SPA_VERSION_HANDLE_FACTORY,
NAME,
NULL,
sizeof(struct impl),