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: don't enum profile/route when one is pending

Browse source
This commit is contained in:
Wim Taymans 2020-06-30 20:20:42 +02:00
parent dc7868a476
commit f126501f83
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -42,6 +42,8 @@ int pa_context_set_error(PA_CONST pa_context *c, int error) {
static void global_free(pa_context *c, struct global *g) static void global_free(pa_context *c, struct global *g)
{ {
pw_log_debug("context %p: %d", c, g->id);
spa_list_remove(&g->link); spa_list_remove(&g->link);
if (g->ginfo && g->ginfo->destroy) if (g->ginfo && g->ginfo->destroy)
@ -309,6 +311,8 @@ static void device_event_info(void *object, const struct pw_device_info *info)
switch (info->params[n].id) { switch (info->params[n].id) {
case SPA_PARAM_EnumProfile: case SPA_PARAM_EnumProfile:
if (g->card_info.pending_profiles)
continue;
remove_params(&g->card_info.profiles, SPA_PARAM_EnumProfile); remove_params(&g->card_info.profiles, SPA_PARAM_EnumProfile);
g->card_info.n_profiles = 0; g->card_info.n_profiles = 0;
g->card_info.pending_profiles = true; g->card_info.pending_profiles = true;
@ -320,6 +324,8 @@ static void device_event_info(void *object, const struct pw_device_info *info)
0, SPA_PARAM_Profile, 0, -1, NULL); 0, SPA_PARAM_Profile, 0, -1, NULL);
break; break;
case SPA_PARAM_EnumRoute: case SPA_PARAM_EnumRoute:
if (g->card_info.pending_ports)
continue;
remove_params(&g->card_info.ports, SPA_PARAM_EnumRoute); remove_params(&g->card_info.ports, SPA_PARAM_EnumRoute);
g->card_info.n_ports = 0; g->card_info.n_ports = 0;
g->card_info.pending_ports = true; g->card_info.pending_ports = true;