diff --git a/pipewire-pulseaudio/src/context.c b/pipewire-pulseaudio/src/context.c index 587cd29dc..d44ba979b 100644 --- a/pipewire-pulseaudio/src/context.c +++ b/pipewire-pulseaudio/src/context.c @@ -143,7 +143,7 @@ const char *pa_context_find_global_name(pa_context *c, uint32_t id) struct global *g; const char *name = NULL; - g = pa_context_find_global(c, id & PA_IDX_MASK_DSP); + g = pa_context_find_global(c, id & PA_IDX_MASK_MONITOR); if (g == NULL) return "unknown object"; @@ -180,7 +180,7 @@ struct global *pa_context_find_global_by_name(pa_context *c, uint32_t mask, cons strncmp(str, name, strlen(name) - 8) == 0) return g; } - if (g->id == id || (g->id == (id & PA_IDX_MASK_DSP))) + if (g->id == id || (g->id == (id & PA_IDX_MASK_MONITOR))) return g; } return NULL; @@ -1126,7 +1126,7 @@ static int set_mask(pa_context *c, struct global *g) pw_log_debug("found sink %d", g->id); g->mask = PA_SUBSCRIPTION_MASK_SINK | PA_SUBSCRIPTION_MASK_SOURCE; g->event = PA_SUBSCRIPTION_EVENT_SINK; - g->node_info.monitor = g->id | PA_IDX_FLAG_DSP; + g->node_info.monitor = g->id | PA_IDX_FLAG_MONITOR; } else if (strcmp(str, "Audio/Source") == 0) { pw_log_debug("found source %d", g->id); diff --git a/pipewire-pulseaudio/src/internal.h b/pipewire-pulseaudio/src/internal.h index e46853451..823cc652a 100644 --- a/pipewire-pulseaudio/src/internal.h +++ b/pipewire-pulseaudio/src/internal.h @@ -227,8 +227,8 @@ struct param { void *param; }; -#define PA_IDX_FLAG_DSP 0x800000U -#define PA_IDX_MASK_DSP 0x7fffffU +#define PA_IDX_FLAG_MONITOR 0x800000U +#define PA_IDX_MASK_MONITOR 0x7fffffU struct port_device { uint32_t n_devices; diff --git a/pipewire-pulseaudio/src/introspect.c b/pipewire-pulseaudio/src/introspect.c index 309f555a3..e13277cd2 100644 --- a/pipewire-pulseaudio/src/introspect.c +++ b/pipewire-pulseaudio/src/introspect.c @@ -931,7 +931,7 @@ static void source_info(pa_operation *o, void *userdata) } else { if (((g = pa_context_find_global(c, d->idx)) == NULL || !(g->mask & PA_SUBSCRIPTION_MASK_SOURCE)) && - (((g = pa_context_find_global(c, d->idx & PA_IDX_MASK_DSP)) == NULL || + (((g = pa_context_find_global(c, d->idx & PA_IDX_MASK_MONITOR)) == NULL || !(g->mask & PA_SUBSCRIPTION_MASK_SOURCE)))) g = NULL; }