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

monitor: Remove monitor event

Browse source 
Remove the monitor event and emit events with structures like we do
for the devices.
This commit is contained in:
Wim Taymans 2019-05-30 12:45:06 +02:00
parent 3780bd1b30
commit 9785d99821
12 changed files with 268 additions and 422 deletions
Download patch file Download diff file Expand all files Collapse all files

31
spa/tools/spa-monitor.c
View file

@ -56,34 +56,27 @@ struct data {
};
static void inspect_item(struct data *data, struct spa_pod *item)
static void inspect_info(struct data *data, const struct spa_monitor_object_info *info)
{
spa_debug_pod(0, NULL, item);
spa_debug_dict(0, info->props);
}
static int on_monitor_info(void *_data, const struct spa_dict *info)
static int on_monitor_info(void *_data, const struct spa_monitor_info *info)
{
spa_debug_dict(0, info);
spa_debug_dict(0, info->props);
return 0;
}
static int on_monitor_event(void *_data, const struct spa_event *event)
static int on_monitor_object_info(void *_data, uint32_t id, const struct spa_monitor_object_info *info)
{
struct data *data = _data;
switch (SPA_MONITOR_EVENT_ID(event)) {
case SPA_MONITOR_EVENT_Added:
fprintf(stderr, "added:\n");
inspect_item(data, SPA_POD_CONTENTS(struct spa_event, event));
break;
case SPA_MONITOR_EVENT_Removed:
fprintf(stderr, "removed:\n");
inspect_item(data, SPA_POD_CONTENTS(struct spa_event, event));
break;
case SPA_MONITOR_EVENT_Changed:
fprintf(stderr, "changed:\n");
inspect_item(data, SPA_POD_CONTENTS(struct spa_event, event));
break;
if (info == NULL) {
fprintf(stderr, "removed: %u\n", id);
}
else {
fprintf(stderr, "added/changed: %u\n", id);
inspect_info(data, info);
}
return 0;
}
@ -107,7 +100,7 @@ static const struct spa_loop_methods impl_loop = {
static const struct spa_monitor_callbacks impl_callbacks = {
SPA_VERSION_MONITOR_CALLBACKS,
.info = on_monitor_info,
.event = on_monitor_event,
.object_info = on_monitor_object_info,
};
static void handle_monitor(struct data *data, struct spa_monitor *monitor)