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

use properties instead of parent_id

Browse source
This commit is contained in:
Wim Taymans 2019-08-16 22:10:08 +02:00
parent f9fce3cb30
commit 2308318b39
4 changed files with 44 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/context.c
View file

@ -150,19 +150,24 @@ struct global *pa_context_find_linked(pa_context *c, uint32_t idx)
struct global *g, *f; struct global *g, *f;
spa_list_for_each(g, &c->globals, link) { spa_list_for_each(g, &c->globals, link) {
uint32_t src_node_id, dst_node_id;
if (g->type != PW_TYPE_INTERFACE_Link) if (g->type != PW_TYPE_INTERFACE_Link)
continue; continue;
pw_log_debug("context %p: %p %d %d %d", c, g, idx, src_node_id = g->link_info.src->port_info.node_id;
g->link_info.src->parent_id, dst_node_id = g->link_info.dst->port_info.node_id;
g->link_info.dst->parent_id);
if (g->link_info.src->parent_id == idx) pw_log_debug("context %p: %p %d %d %d", c, g, idx,
f = pa_context_find_global(c, g->link_info.dst->parent_id); src_node_id, dst_node_id);
else if (g->link_info.dst->parent_id == idx)
f = pa_context_find_global(c, g->link_info.src->parent_id); if (src_node_id == idx)
f = pa_context_find_global(c, dst_node_id);
else if (dst_node_id == idx)
f = pa_context_find_global(c, src_node_id);
else else
continue; continue;
if (f == NULL) if (f == NULL)
continue; continue;
return f; return f;
@ -203,6 +208,7 @@ static void device_event_info(void *object, const struct pw_device_info *info)
{ {
struct global *g = object; struct global *g = object;
pa_card_info *i = &g->card_info.info; pa_card_info *i = &g->card_info.info;
const char *str;
uint32_t n; uint32_t n;
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);
@ -211,7 +217,8 @@ static void device_event_info(void *object, const struct pw_device_info *info)
i->index = g->id; i->index = g->id;
i->name = info->props ? i->name = info->props ?
spa_dict_lookup(info->props, PW_KEY_DEVICE_NAME) : "unknown"; spa_dict_lookup(info->props, PW_KEY_DEVICE_NAME) : "unknown";
i->owner_module = g->parent_id; str = info->props ? spa_dict_lookup(info->props, PW_KEY_MODULE_ID) : NULL;
i->owner_module = str ? (unsigned)atoi(str) : SPA_ID_INVALID;
if (info->change_mask & PW_DEVICE_CHANGE_MASK_PROPS) { if (info->change_mask & PW_DEVICE_CHANGE_MASK_PROPS) {
i->driver = info->props ? i->driver = info->props ?
spa_dict_lookup(info->props, PW_KEY_DEVICE_API) : NULL; spa_dict_lookup(info->props, PW_KEY_DEVICE_API) : NULL;
@ -449,13 +456,15 @@ static void module_destroy(void *data)
static void client_event_info(void *object, const struct pw_client_info *info) static void client_event_info(void *object, const struct pw_client_info *info)
{ {
struct global *g = object; struct global *g = object;
const char *str;
pa_client_info *i = &g->client_info.info; pa_client_info *i = &g->client_info.info;
pw_log_debug("update %d", g->id); pw_log_debug("update %d", g->id);
info = g->info = pw_client_info_update(g->info, info); info = g->info = pw_client_info_update(g->info, info);
i->index = g->id; i->index = g->id;
i->owner_module = g->parent_id; str = info->props ? spa_dict_lookup(info->props, PW_KEY_MODULE_ID) : NULL;
i->owner_module = str ? (unsigned)atoi(str) : SPA_ID_INVALID;
if (info->change_mask & PW_CLIENT_CHANGE_MASK_PROPS) { if (info->change_mask & PW_CLIENT_CHANGE_MASK_PROPS) {
if (i->proplist) if (i->proplist)
@ -570,6 +579,10 @@ static int set_mask(pa_context *c, struct global *g)
g->mask = PA_SUBSCRIPTION_MASK_SOURCE_OUTPUT; g->mask = PA_SUBSCRIPTION_MASK_SOURCE_OUTPUT;
g->event = PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT; g->event = PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT;
} }
if ((str = pw_properties_get(g->props, PW_KEY_CLIENT_ID)) != NULL)
g->node_info.client_id = atoi(str);
events = &node_events; events = &node_events;
client_version = PW_VERSION_NODE_PROXY; client_version = PW_VERSION_NODE_PROXY;
destroy = node_destroy; destroy = node_destroy;
@ -596,7 +609,9 @@ static int set_mask(pa_context *c, struct global *g)
break; break;
case PW_TYPE_INTERFACE_Port: case PW_TYPE_INTERFACE_Port:
pw_log_debug("found port %d", g->id); if ((str = pw_properties_get(g->props, PW_KEY_NODE_ID)) != NULL)
g->port_info.node_id = atoi(str);
pw_log_debug("found port %d node %d", g->id, g->port_info.node_id);
break; break;
case PW_TYPE_INTERFACE_Link: case PW_TYPE_INTERFACE_Link:
@ -611,15 +626,15 @@ static int set_mask(pa_context *c, struct global *g)
return 0; return 0;
pw_log_debug("link %d:%d->%d:%d", pw_log_debug("link %d:%d->%d:%d",
g->link_info.src->parent_id, g->link_info.src->port_info.node_id,
g->link_info.src->id, g->link_info.src->id,
g->link_info.dst->parent_id, g->link_info.dst->port_info.node_id,
g->link_info.dst->id); g->link_info.dst->id);
if ((f = pa_context_find_global(c, g->link_info.src->parent_id)) != NULL && if ((f = pa_context_find_global(c, g->link_info.src->port_info.node_id)) != NULL &&
!f->init) !f->init)
emit_event(c, f, PA_SUBSCRIPTION_EVENT_CHANGE); emit_event(c, f, PA_SUBSCRIPTION_EVENT_CHANGE);
if ((f = pa_context_find_global(c, g->link_info.dst->parent_id)) != NULL && if ((f = pa_context_find_global(c, g->link_info.dst->port_info.node_id)) != NULL &&
!f->init) !f->init)
emit_event(c, f, PA_SUBSCRIPTION_EVENT_CHANGE); emit_event(c, f, PA_SUBSCRIPTION_EVENT_CHANGE);
@ -649,7 +664,7 @@ static int set_mask(pa_context *c, struct global *g)
return 1; return 1;
} }
static void registry_event_global(void *data, uint32_t id, uint32_t parent_id, static void registry_event_global(void *data, uint32_t id,
uint32_t permissions, uint32_t type, uint32_t version, uint32_t permissions, uint32_t type, uint32_t version,
const struct spa_dict *props) const struct spa_dict *props)
{ {
@ -660,7 +675,6 @@ static void registry_event_global(void *data, uint32_t id, uint32_t parent_id,
pw_log_debug("context %p: global %d %u %p", c, id, type, g); pw_log_debug("context %p: global %d %u %p", c, id, type, g);
g->context = c; g->context = c;
g->id = id; g->id = id;
g->parent_id = parent_id;
g->type = type; g->type = type;
g->init = true; g->init = true;
g->props = props ? pw_properties_new_dict(props) : NULL; g->props = props ? pw_properties_new_dict(props) : NULL;

5
src/internal.h
View file

@ -216,7 +216,6 @@ struct param {
struct global { struct global {
struct spa_list link; struct spa_list link;
uint32_t id; uint32_t id;
uint32_t parent_id;
uint32_t type; uint32_t type;
struct pw_properties *props; struct pw_properties *props;
@ -243,12 +242,16 @@ struct global {
} link_info; } link_info;
/* for sink/source */ /* for sink/source */
struct { struct {
uint32_t client_id;
uint32_t monitor; uint32_t monitor;
float volume; float volume;
bool mute; bool mute;
uint32_t n_channel_volumes; uint32_t n_channel_volumes;
float channel_volumes[SPA_AUDIO_MAX_CHANNELS]; float channel_volumes[SPA_AUDIO_MAX_CHANNELS];
} node_info; } node_info;
struct {
uint32_t node_id;
} port_info;
/* for devices */ /* for devices */
struct { struct {
struct spa_list profiles; struct spa_list profiles;

12
src/introspect.c
View file

@ -116,7 +116,7 @@ static void sink_callback(struct sink_data *d)
else else
i.sample_spec.channels = 2; i.sample_spec.channels = 2;
pa_channel_map_init_auto(&i.channel_map, i.sample_spec.channels, PA_CHANNEL_MAP_OSS); pa_channel_map_init_auto(&i.channel_map, i.sample_spec.channels, PA_CHANNEL_MAP_OSS);
i.owner_module = g->parent_id; i.owner_module = 0;
i.volume.channels = i.sample_spec.channels; i.volume.channels = i.sample_spec.channels;
for (n = 0; n < i.volume.channels; n++) for (n = 0; n < i.volume.channels; n++)
i.volume.values[n] = g->node_info.volume * g->node_info.channel_volumes[n] * PA_VOLUME_NORM; i.volume.values[n] = g->node_info.volume * g->node_info.channel_volumes[n] * PA_VOLUME_NORM;
@ -562,7 +562,7 @@ static void source_callback(struct source_data *d)
else else
i.sample_spec.channels = 2; i.sample_spec.channels = 2;
pa_channel_map_init_auto(&i.channel_map, i.sample_spec.channels, PA_CHANNEL_MAP_OSS); pa_channel_map_init_auto(&i.channel_map, i.sample_spec.channels, PA_CHANNEL_MAP_OSS);
i.owner_module = g->parent_id; i.owner_module = 0;
i.volume.channels = i.sample_spec.channels; i.volume.channels = i.sample_spec.channels;
for (n = 0; n < i.volume.channels; n++) for (n = 0; n < i.volume.channels; n++)
i.volume.values[n] = g->node_info.volume * g->node_info.channel_volumes[n] * PA_VOLUME_NORM; i.volume.values[n] = g->node_info.volume * g->node_info.channel_volumes[n] * PA_VOLUME_NORM;
@ -1502,13 +1502,13 @@ static void sink_input_callback(struct sink_input_data *d)
else else
name = "unknown"; name = "unknown";
cl = pa_context_find_global(d->context, g->parent_id); cl = pa_context_find_global(d->context, g->node_info.client_id);
spa_zero(i); spa_zero(i);
i.index = g->id; i.index = g->id;
i.name = name; i.name = name;
i.owner_module = PA_INVALID_INDEX; i.owner_module = PA_INVALID_INDEX;
i.client = g->parent_id; i.client = g->node_info.client_id;
if (s) { if (s) {
i.sink = s->device_index; i.sink = s->device_index;
} }
@ -1802,13 +1802,13 @@ static void source_output_callback(struct source_output_data *d)
if (name == NULL) if (name == NULL)
name = "unknown"; name = "unknown";
cl = pa_context_find_global(d->context, g->parent_id); cl = pa_context_find_global(d->context, g->node_info.client_id);
spa_zero(i); spa_zero(i);
i.index = g->id; i.index = g->id;
i.name = name ? name : "Unknown"; i.name = name ? name : "Unknown";
i.owner_module = PA_INVALID_INDEX; i.owner_module = PA_INVALID_INDEX;
i.client = g->parent_id; i.client = g->node_info.client_id;
if (s) { if (s) {
i.source = s->device_index; i.source = s->device_index;
} }

5
src/stream.c
View file

@ -797,7 +797,10 @@ const char *pa_stream_get_device_name(pa_stream *s)
PA_CHECK_VALIDITY_RETURN_NULL(s->context, s->state == PA_STREAM_READY, PA_ERR_BADSTATE); PA_CHECK_VALIDITY_RETURN_NULL(s->context, s->state == PA_STREAM_READY, PA_ERR_BADSTATE);
PA_CHECK_VALIDITY_RETURN_NULL(s->context, s->direction != PA_STREAM_UPLOAD, PA_ERR_BADSTATE); PA_CHECK_VALIDITY_RETURN_NULL(s->context, s->direction != PA_STREAM_UPLOAD, PA_ERR_BADSTATE);
PA_CHECK_VALIDITY_RETURN_NULL(s->context, s->device_name, PA_ERR_BADSTATE); // PA_CHECK_VALIDITY_RETURN_NULL(s->context, s->device_name, PA_ERR_BADSTATE);
if (s->device_name == NULL)
return "unnamed";
return s->device_name; return s->device_name;
} }