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/tools/spa-monitor.c
View file

@ -46,6 +46,8 @@ struct data {
struct spa_log *log;
struct spa_loop main_loop;
struct spa_monitor_callbacks callbacks;
struct spa_support support[3];
uint32_t n_support;
@ -63,9 +65,11 @@ static void inspect_item(struct data *data, struct spa_monitor_item *item)
spa_debug_pod(&item->object.pod);
}
static void on_monitor_event(struct spa_monitor *monitor, struct spa_event *event, void *user_data)
static void on_monitor_event(const struct spa_monitor_callbacks *callbacks,
struct spa_monitor *monitor,
struct spa_event *event)
{
struct data *data = user_data;
struct data *data = SPA_CONTAINER_OF(callbacks, struct data, callbacks);
if (SPA_EVENT_TYPE(event) == data->type.monitor.Added) {
fprintf(stderr, "added:\n");
@ -99,7 +103,8 @@ static void do_remove_source(struct spa_source *source)
{
}
static const struct spa_monitor_callbacks callbacks = {
static const struct spa_monitor_callbacks impl_callbacks = {
SPA_VERSION_MONITOR_CALLBACKS,
on_monitor_event,
};
@ -121,8 +126,8 @@ static void handle_monitor(struct data *data, struct spa_monitor *monitor)
}
inspect_item(data, item);
}
spa_monitor_set_callbacks(monitor, &callbacks, sizeof(callbacks), &data);
data->callbacks = impl_callbacks;
spa_monitor_set_callbacks(monitor, &data->callbacks);
while (true) {
int i, r;
@ -167,7 +172,7 @@ int main(int argc, char *argv[])
data.map = &default_map.map;
data.log = &default_log.log;
data.main_loop.size = sizeof(struct spa_loop);
data.main_loop.version = SPA_VERSION_LOOP;
data.main_loop.add_source = do_add_source;
data.main_loop.update_source = do_update_source;
data.main_loop.remove_source = do_remove_source;