From 29c7a288177c260cf2b3d8f80e807305b96594ba Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 15 Jan 2009 20:07:13 +0100
Subject: kill autoload stuff as planned

---
 src/pulsecore/namereg.c | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'src/pulsecore/namereg.c')

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);
-- 
cgit