diff options
author | Lennart Poettering <lennart@poettering.net> | 2009-01-15 20:07:13 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2009-01-15 20:07:13 +0100 |
commit | 29c7a288177c260cf2b3d8f80e807305b96594ba (patch) | |
tree | a7c87c8345c3e89799079f9f9b0362e618813ac8 /src/pulsecore/namereg.c | |
parent | 43762ed620589a9007b0c6b77022eb2ea1c6d926 (diff) |
kill autoload stuff as planned
Diffstat (limited to 'src/pulsecore/namereg.c')
-rw-r--r-- | src/pulsecore/namereg.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/pulsecore/namereg.c b/src/pulsecore/namereg.c index c1a434ae..3b9ce886 100644 --- a/src/pulsecore/namereg.c +++ b/src/pulsecore/namereg.c @@ -178,7 +178,7 @@ void pa_namereg_unregister(pa_core *c, const char *name) { pa_xfree(e); } -void* pa_namereg_get(pa_core *c, const char *name, pa_namereg_type_t type, pa_bool_t autoload) { +void* pa_namereg_get(pa_core *c, const char *name, pa_namereg_type_t type) { struct namereg_entry *e; uint32_t idx; pa_assert(c); @@ -202,7 +202,7 @@ void* pa_namereg_get(pa_core *c, const char *name, pa_namereg_type_t type, pa_bo if (type == PA_NAMEREG_SOURCE) { pa_sink *k; - if ((k = pa_namereg_get(c, NULL, PA_NAMEREG_SINK, autoload))) + if ((k = pa_namereg_get(c, NULL, PA_NAMEREG_SINK))) return k->monitor_source; } } else if (*name == '@') @@ -215,18 +215,8 @@ void* pa_namereg_get(pa_core *c, const char *name, pa_namereg_type_t type, pa_bo if (e->type == type) return e->data; - if (pa_atou(name, &idx) < 0) { - - if (autoload) { - pa_autoload_request(c, name, type); - - if (c->namereg && (e = pa_hashmap_get(c->namereg, name))) - if (e->type == type) - return e->data; - } - + if (pa_atou(name, &idx) < 0) return NULL; - } if (type == PA_NAMEREG_SINK) return pa_idxset_get_by_index(c->sinks, idx); |