1 files changed, 64 insertions, 15 deletions

diff --git a/polyp/autoload.c b/polyp/autoload.c
index 988b0921..8eb5bbf5 100644
--- a/polyp/autoload.c
+++ b/polyp/autoload.c
@@ -30,36 +30,64 @@
 #include "autoload.h"
 #include "module.h"
 #include "xmalloc.h"
+#include "memchunk.h"
+#include "sound-file.h"
+#include "log.h"
+#include "scache.h"
 
 static void entry_free(struct pa_autoload_entry *e) {
     assert(e);
     pa_xfree(e->name);
     pa_xfree(e->module);
     pa_xfree(e->argument);
+    pa_xfree(e->filename);
     pa_xfree(e);
 }
 
-void pa_autoload_add(struct pa_core *c, const char*name, enum pa_namereg_type type, const char*module, const char *argument) {
+static struct pa_autoload_entry* entry_new(struct pa_core *c, const char *name) {
     struct pa_autoload_entry *e = NULL;
-    assert(c && name && module);
+    assert(c && name);
     
-    if (c->autoload_hashmap && (e = pa_hashmap_get(c->autoload_hashmap, name))) {
-        pa_xfree(e->module);
-        pa_xfree(e->argument);
-    } else {
-        e = pa_xmalloc(sizeof(struct pa_autoload_entry));
-        e->name = pa_xstrdup(name);
+    if (c->autoload_hashmap && (e = pa_hashmap_get(c->autoload_hashmap, name)))
+        return NULL;
+    
+    e = pa_xmalloc(sizeof(struct pa_autoload_entry));
+    e->name = pa_xstrdup(name);
+    e->module = e->argument = e->filename = NULL;
+    e->in_action = 0;
+    
+    if (!c->autoload_hashmap)
+        c->autoload_hashmap = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
+    assert(c->autoload_hashmap);
+    
+    pa_hashmap_put(c->autoload_hashmap, e->name, e);
 
-        if (!c->autoload_hashmap)
-            c->autoload_hashmap = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
-        assert(c->autoload_hashmap);
+    return e;
+}
 
-        pa_hashmap_put(c->autoload_hashmap, e->name, e);
-    }
+int pa_autoload_add_module(struct pa_core *c, const char*name, enum pa_namereg_type type, const char*module, const char *argument) {
+    struct pa_autoload_entry *e = NULL;
+    assert(c && name && module);
 
+    if (!(e = entry_new(c, name)))
+        return -1;
+        
     e->module = pa_xstrdup(module);
     e->argument = pa_xstrdup(argument);
     e->type = type;
+    return 0;
+}
+
+int pa_autoload_add_sample(struct pa_core *c, const char*name, enum pa_namereg_type type, const char*filename) {
+    struct pa_autoload_entry *e = NULL;
+    assert(c && name && filename);
+
+    if (!(e = entry_new(c, name)))
+        return -1;
+        
+    e->filename = pa_xstrdup(filename);
+    e->type = PA_NAMEREG_SAMPLE;
+    return 0;
 }
 
 int pa_autoload_remove(struct pa_core *c, const char*name, enum pa_namereg_type type) {
@@ -82,8 +110,29 @@ void pa_autoload_request(struct pa_core *c, const char *name, enum pa_namereg_ty
     if (!c->autoload_hashmap || !(e = pa_hashmap_get(c->autoload_hashmap, name)) || (e->type != type))
         return;
 
-    if ((m = pa_module_load(c, e->module, e->argument)))
-        m->auto_unload = 1;
+    if (e->in_action)
+        return;
+
+    e->in_action = 1;
+
+    if (type == PA_NAMEREG_SINK || type == PA_NAMEREG_SOURCE) {
+        if ((m = pa_module_load(c, e->module, e->argument)))
+            m->auto_unload = 1;
+            
+    } else {
+        struct pa_sample_spec ss;
+        struct pa_memchunk chunk;
+        assert(type == PA_NAMEREG_SAMPLE);
+
+        if (pa_sound_file_load(e->filename, &ss, &chunk, c->memblock_stat) < 0) 
+            pa_log(__FILE__": failed to load sound file '%s' for autoload entry '%s'.\n", e->filename, e->name);
+        else {
+            pa_scache_add_item(c, e->name, &ss, &chunk, NULL, 1);
+            pa_memblock_unref(chunk.memblock);
+        }
+    }
+
+    e->in_action = 0;
 }
 
 static void free_func(void *p, void *userdata) {