mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

context: track changes more closely

Browse source 
Mark the global changes and only emit a change event when
something changed.
This commit is contained in:
Wim Taymans 2020-10-22 11:03:27 +02:00
parent 2dee35c216
commit 7782352e8d
2 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

34
pipewire-pulseaudio/src/context.c
View file

@ -315,11 +315,15 @@ static void do_global_sync(struct global *g)
return; return;
} }
g->init = false; g->init = false;
g->changed++;
event = PA_SUBSCRIPTION_EVENT_NEW; event = PA_SUBSCRIPTION_EVENT_NEW;
} else { } else {
event = PA_SUBSCRIPTION_EVENT_CHANGE; event = PA_SUBSCRIPTION_EVENT_CHANGE;
} }
emit_event(g->context, g, event); if (g->changed > 0) {
emit_event(g->context, g, event);
g->changed = 0;
}
} }
@ -399,6 +403,7 @@ static void device_event_info(void *object, const struct pw_device_info *info)
i->proplist = pa_proplist_new_dict(info->props); i->proplist = pa_proplist_new_dict(info->props);
} }
update_device_props(g); update_device_props(g);
g->changed++;
} }
if (info->change_mask & PW_DEVICE_CHANGE_MASK_PARAMS) { if (info->change_mask & PW_DEVICE_CHANGE_MASK_PARAMS) {
for (n = 0; n < info->n_params; n++) { for (n = 0; n < info->n_params; n++) {
@ -415,12 +420,14 @@ static void device_event_info(void *object, const struct pw_device_info *info)
if (g->card_info.pending_profiles) if (g->card_info.pending_profiles)
continue; continue;
remove_params(&g->card_info.profiles, id); remove_params(&g->card_info.profiles, id);
g->changed++;
g->card_info.n_profiles = 0; g->card_info.n_profiles = 0;
break; break;
case SPA_PARAM_EnumRoute: case SPA_PARAM_EnumRoute:
if (g->card_info.pending_ports) if (g->card_info.pending_ports)
continue; continue;
remove_params(&g->card_info.ports, id); remove_params(&g->card_info.ports, id);
g->changed++;
g->card_info.n_ports = 0; g->card_info.n_ports = 0;
break; break;
case SPA_PARAM_Route: case SPA_PARAM_Route:
@ -590,7 +597,10 @@ static void device_event_param(void *object, int seq,
return; return;
} }
pw_log_debug("device %d: current profile %d", g->id, index); pw_log_debug("device %d: current profile %d", g->id, index);
g->card_info.active_profile = index; if (g->card_info.active_profile != index) {
g->changed++;
g->card_info.active_profile = index;
}
break; break;
} }
case SPA_PARAM_EnumRoute: case SPA_PARAM_EnumRoute:
@ -894,8 +904,10 @@ static void device_sync_ports(struct global *g)
} }
if (props) if (props)
changed += parse_props(ng, props, true); changed += parse_props(ng, props, true);
if (changed) if (changed) {
ng->changed += changed;
global_sync(ng); global_sync(ng);
}
} }
} }
} }
@ -951,6 +963,7 @@ static void clear_node_formats(struct global *g)
pa_format_info *f; pa_format_info *f;
pw_array_for_each(f, &g->node_info.formats) pw_array_for_each(f, &g->node_info.formats)
pa_format_info_free(f); pa_format_info_free(f);
g->changed++;
} }
static void node_event_info(void *object, const struct pw_node_info *info) static void node_event_info(void *object, const struct pw_node_info *info)
@ -962,11 +975,13 @@ static void node_event_info(void *object, const struct pw_node_info *info)
pw_log_debug("global %p: id:%d change-mask:%"PRIu64, g, g->id, info->change_mask); pw_log_debug("global %p: id:%d change-mask:%"PRIu64, g, g->id, info->change_mask);
info = g->info = pw_node_info_update(g->info, info); info = g->info = pw_node_info_update(g->info, info);
if (info->props && (str = spa_dict_lookup(info->props, "card.profile.device"))) if (info->change_mask & PW_NODE_CHANGE_MASK_PROPS) {
g->node_info.profile_device_id = atoi(str); if (info->props && (str = spa_dict_lookup(info->props, "card.profile.device")))
else g->node_info.profile_device_id = atoi(str);
g->node_info.profile_device_id = SPA_ID_INVALID; else
g->node_info.profile_device_id = SPA_ID_INVALID;
g->changed++;
}
if (info->change_mask & PW_NODE_CHANGE_MASK_PARAMS) { if (info->change_mask & PW_NODE_CHANGE_MASK_PARAMS) {
for (i = 0; i < info->n_params; i++) { for (i = 0; i < info->n_params; i++) {
uint32_t id = info->params[i].id; uint32_t id = info->params[i].id;
@ -1081,8 +1096,8 @@ static void module_event_info(void *object, const struct pw_module_info *info)
pa_proplist_update_dict(i->proplist, info->props); pa_proplist_update_dict(i->proplist, info->props);
else else
i->proplist = pa_proplist_new_dict(info->props); i->proplist = pa_proplist_new_dict(info->props);
g->changed++;
} }
i->name = info->name; i->name = info->name;
i->argument = info->args; i->argument = info->args;
i->n_used = -1; i->n_used = -1;
@ -1132,6 +1147,7 @@ static void client_event_info(void *object, const struct pw_client_info *info)
spa_dict_lookup(info->props, PW_KEY_APP_NAME) : NULL; spa_dict_lookup(info->props, PW_KEY_APP_NAME) : NULL;
i->driver = info->props ? i->driver = info->props ?
spa_dict_lookup(info->props, PW_KEY_PROTOCOL) : NULL; spa_dict_lookup(info->props, PW_KEY_PROTOCOL) : NULL;
g->changed++;
} }
if (i->name == NULL) if (i->name == NULL)
i->name = "Unknown"; i->name = "Unknown";

1
pipewire-pulseaudio/src/internal.h
View file

@ -264,6 +264,7 @@ struct global {
int init:1; int init:1;
int sync:1; int sync:1;
int changed;
void *info; void *info;
struct global_info *ginfo; struct global_info *ginfo;