mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse: DSP -> MONITOR

Browse source
This commit is contained in:
Wim Taymans 2020-08-20 17:35:57 +02:00
parent adfa88c961
commit 7cdc36d506
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -143,7 +143,7 @@ const char *pa_context_find_global_name(pa_context *c, uint32_t id)
struct global *g; struct global *g;
const char *name = NULL; 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) if (g == NULL)
return "unknown object"; 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) strncmp(str, name, strlen(name) - 8) == 0)
return g; 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 g;
} }
return NULL; return NULL;
@ -1126,7 +1126,7 @@ static int set_mask(pa_context *c, struct global *g)
pw_log_debug("found sink %d", g->id); pw_log_debug("found sink %d", g->id);
g->mask = PA_SUBSCRIPTION_MASK_SINK | PA_SUBSCRIPTION_MASK_SOURCE; g->mask = PA_SUBSCRIPTION_MASK_SINK | PA_SUBSCRIPTION_MASK_SOURCE;
g->event = PA_SUBSCRIPTION_EVENT_SINK; 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) { else if (strcmp(str, "Audio/Source") == 0) {
pw_log_debug("found source %d", g->id); pw_log_debug("found source %d", g->id);

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

@ -227,8 +227,8 @@ struct param {
void *param; void *param;
}; };
#define PA_IDX_FLAG_DSP 0x800000U #define PA_IDX_FLAG_MONITOR 0x800000U
#define PA_IDX_MASK_DSP 0x7fffffU #define PA_IDX_MASK_MONITOR 0x7fffffU
struct port_device { struct port_device {
uint32_t n_devices; uint32_t n_devices;

2
pipewire-pulseaudio/src/introspect.c
View file

@ -931,7 +931,7 @@ static void source_info(pa_operation *o, void *userdata)
} else { } else {
if (((g = pa_context_find_global(c, d->idx)) == NULL || if (((g = pa_context_find_global(c, d->idx)) == NULL ||
!(g->mask & PA_SUBSCRIPTION_MASK_SOURCE)) && !(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->mask & PA_SUBSCRIPTION_MASK_SOURCE))))
g = NULL; g = NULL;
} }