mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

monitor: set node enabled state

Browse source 
Let the monitor update the node enabled states when creating
and on change events.
This commit is contained in:
Wim Taymans 2018-01-30 15:08:44 +01:00
parent bd1fea49c2
commit ad1e5fdc10
3 changed files with 43 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/modules/spa/spa-monitor.c
View file

@ -67,14 +67,17 @@ static void add_item(struct pw_spa_monitor *this, struct spa_pod *item)
struct pw_properties *props = NULL;
const char *name, *id, *klass;
struct spa_handle_factory *factory;
enum spa_monitor_item_state state;
struct spa_pod *info = NULL;
struct pw_type *t = pw_core_get_type(impl->core);
const struct spa_support *support;
enum pw_spa_node_flags flags;
uint32_t n_support;
if (spa_pod_object_parse(item,
":",t->monitor.name, "s", &name,
":",t->monitor.id, "s", &id,
":",t->monitor.state, "i", &state,
":",t->monitor.name, "s", &name,
":",t->monitor.klass, "s", &klass,
":",t->monitor.factory, "p", &factory,
":",t->monitor.info, "T", &info, NULL) < 0)
@ -114,11 +117,14 @@ static void add_item(struct pw_spa_monitor *this, struct spa_pod *item)
return;
}
flags = PW_SPA_NODE_FLAG_ACTIVATE;
flags |= (state == SPA_MONITOR_ITEM_STATE_AVAILABLE) ? 0 : PW_SPA_NODE_FLAG_DISABLE;
mitem = calloc(1, sizeof(struct monitor_item));
mitem->id = strdup(id);
mitem->handle = handle;
mitem->node = pw_spa_node_new(impl->core, NULL, impl->parent, name,
PW_SPA_NODE_FLAG_ACTIVATE,
flags,
node_iface, handle, props, 0);
spa_list_append(&impl->item_list, &mitem->link);
@ -165,6 +171,36 @@ static void remove_item(struct pw_spa_monitor *this, struct spa_pod *item)
destroy_item(mitem);
}
static void change_item(struct pw_spa_monitor *this, struct spa_pod *item)
{
struct impl *impl = SPA_CONTAINER_OF(this, struct impl, this);
struct monitor_item *mitem;
const char *name, *id;
struct pw_type *t = pw_core_get_type(impl->core);
enum spa_monitor_item_state state;
if (spa_pod_object_parse(item,
":",t->monitor.name, "s", &name,
":",t->monitor.state, "i", &state,
":",t->monitor.id, "s", &id, NULL) < 0)
return;
pw_log_debug("monitor %p: change: \"%s\" (%s)", this, name, id);
mitem = find_item(this, id);
if (mitem == NULL)
return;
switch (state) {
case SPA_MONITOR_ITEM_STATE_AVAILABLE:
pw_node_set_enabled(mitem->node, true);
break;
case SPA_MONITOR_ITEM_STATE_DISABLED:
case SPA_MONITOR_ITEM_STATE_UNAVAILABLE:
pw_node_set_enabled(mitem->node, false);
break;
}
}
static void on_monitor_event(void *data, struct spa_event *event)
{
struct impl *impl = data;
@ -179,13 +215,7 @@ static void on_monitor_event(void *data, struct spa_event *event)
remove_item(this, item);
} else if (SPA_EVENT_TYPE(event) == t->monitor.Changed) {
struct spa_pod *item = SPA_POD_CONTENTS(struct spa_event, event);
const char *name;
if (spa_pod_object_parse(item,
":",t->monitor.name, "s", &name, NULL) < 0)
return;
pw_log_debug("monitor %p: changed: \"%s\"", this, name);
change_item(this, item);
}
}

2
src/modules/spa/spa-node.c
View file

@ -75,6 +75,8 @@ static void pw_spa_node_destroy(void *data)
static void complete_init(struct impl *impl)
{
struct pw_node *this = impl->this;
if (impl->flags & PW_SPA_NODE_FLAG_DISABLE)
pw_node_set_enabled(this, false);
pw_node_register(this, impl->owner, impl->parent, NULL);
if (impl->flags & PW_SPA_NODE_FLAG_ACTIVATE)
pw_node_set_active(this, true);

3
src/modules/spa/spa-node.h
View file

@ -32,7 +32,8 @@ extern "C" {
enum pw_spa_node_flags {
PW_SPA_NODE_FLAG_ASYNC = (1 << 0),
PW_SPA_NODE_FLAG_ACTIVATE = (1 << 1),
PW_SPA_NODE_FLAG_DISABLE = (1 << 1),
PW_SPA_NODE_FLAG_ACTIVATE = (1 << 2),
};
struct pw_node *