mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-10 13:29:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

namereg: Revert default device handling back to the upstream version.

Browse source
This commit is contained in:
Tanu Kaskinen 2009-08-17 08:26:06 +03:00
parent bcaba0b1b4
commit f48684e4db
1 changed files with 9 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

57
src/pulsecore/namereg.c
View file

@ -149,55 +149,21 @@ const char *pa_namereg_register(pa_core *c, const char *name, pa_namereg_type_t
pa_assert_se(pa_hashmap_put(c->namereg, e->name, e) >= 0); pa_assert_se(pa_hashmap_put(c->namereg, e->name, e) >= 0);
if (type == PA_NAMEREG_SINK && !c->default_sink)
pa_namereg_set_default_sink(c, data);
else if (type == PA_NAMEREG_SOURCE && !c->default_source)
pa_namereg_set_default_source(c, data);
return e->name; return e->name;
} }
void pa_namereg_unregister(pa_core *c, const char *name) { void pa_namereg_unregister(pa_core *c, const char *name) {
struct namereg_entry *e; struct namereg_entry *e;
uint32_t idx;
pa_assert(c); pa_assert(c);
pa_assert(name); pa_assert(name);
pa_assert_se(e = pa_hashmap_remove(c->namereg, name)); pa_assert_se(e = pa_hashmap_remove(c->namereg, name));
if (c->default_sink == e->data) { if (c->default_sink == e->data)
pa_sink *new_default = NULL; pa_namereg_set_default_sink(c, NULL);
else if (c->default_source == e->data)
/* FIXME: the selection here should be based priority values on pa_namereg_set_default_source(c, NULL);
* the sinks */
PA_IDXSET_FOREACH(new_default, c->sinks, idx) {
if (new_default != e->data && PA_SINK_IS_LINKED(pa_sink_get_state(new_default)))
break;
}
pa_namereg_set_default_sink(c, new_default);
} else if (c->default_source == e->data) {
pa_source *new_default = NULL;
/* First, try to find one that isn't a monitor */
PA_IDXSET_FOREACH(new_default, c->sources, idx) {
if (new_default != e->data && !new_default->monitor_of && PA_SOURCE_IS_LINKED(pa_source_get_state(new_default)))
break;
}
if (!new_default) {
/* Then, fallback to a monitor */
PA_IDXSET_FOREACH(new_default, c->sources, idx) {
if (new_default != e->data && PA_SOURCE_IS_LINKED(pa_source_get_state(new_default)))
break;
}
}
pa_namereg_set_default_source(c, new_default);
}
pa_xfree(e->name); pa_xfree(e->name);
pa_xfree(e); pa_xfree(e);
@ -225,6 +191,7 @@ void* pa_namereg_get(pa_core *c, const char *name, pa_namereg_type_t type) {
if ((s = pa_namereg_get(c, NULL, PA_NAMEREG_SINK))) if ((s = pa_namereg_get(c, NULL, PA_NAMEREG_SINK)))
return s->monitor_source; return s->monitor_source;
} }
if (!name) if (!name)
@ -281,18 +248,15 @@ pa_source* pa_namereg_set_default_source(pa_core*c, pa_source *s) {
return s; return s;
} }
/* XXX: After removing old functionality, has this function become useless? */
pa_sink *pa_namereg_get_default_sink(pa_core *c) { pa_sink *pa_namereg_get_default_sink(pa_core *c) {
pa_sink *s; pa_sink *s;
uint32_t idx; uint32_t idx;
pa_assert(c); pa_assert(c);
if (!c->default_sink || PA_SINK_IS_LINKED(pa_sink_get_state(c->default_sink))) if (c->default_sink && PA_SINK_IS_LINKED(pa_sink_get_state(c->default_sink)))
return c->default_sink; return c->default_sink;
/* The old default sink has become unlinked, set a new one. */
/* FIXME: the selection here should be based priority values on /* FIXME: the selection here should be based priority values on
* the sinks */ * the sinks */
@ -300,21 +264,18 @@ pa_sink *pa_namereg_get_default_sink(pa_core *c) {
if (PA_SINK_IS_LINKED(pa_sink_get_state(s))) if (PA_SINK_IS_LINKED(pa_sink_get_state(s)))
return pa_namereg_set_default_sink(c, s); return pa_namereg_set_default_sink(c, s);
return pa_namereg_set_default_sink(c, NULL); return NULL;
} }
/* XXX: After removing old functionality, has this function become useless? */
pa_source *pa_namereg_get_default_source(pa_core *c) { pa_source *pa_namereg_get_default_source(pa_core *c) {
pa_source *s; pa_source *s;
uint32_t idx; uint32_t idx;
pa_assert(c); pa_assert(c);
if (!c->default_source || PA_SOURCE_IS_LINKED(pa_source_get_state(c->default_source))) if (c->default_source && PA_SOURCE_IS_LINKED(pa_source_get_state(c->default_source)))
return c->default_source; return c->default_source;
/* The old default source has become unlinked, set a new one. */
/* First, try to find one that isn't a monitor */ /* First, try to find one that isn't a monitor */
PA_IDXSET_FOREACH(s, c->sources, idx) PA_IDXSET_FOREACH(s, c->sources, idx)
if (!s->monitor_of && PA_SOURCE_IS_LINKED(pa_source_get_state(s))) if (!s->monitor_of && PA_SOURCE_IS_LINKED(pa_source_get_state(s)))
@ -325,5 +286,5 @@ pa_source *pa_namereg_get_default_source(pa_core *c) {
if (PA_SOURCE_IS_LINKED(pa_source_get_state(s))) if (PA_SOURCE_IS_LINKED(pa_source_get_state(s)))
return pa_namereg_set_default_source(c, s); return pa_namereg_set_default_source(c, s);
return pa_namereg_set_default_source(c, NULL); return NULL;
} }