Reorganised the source tree. We now have src/ with a couple of subdirs:

 * daemon/ - Contains the files specific to the polypaudio daemon.
 * modules/ - All loadable modules.
 * polyp/ - Files that are part of the public, application interface or
   are only used in libpolyp.
 * polypcore/ - All other shared files.
 * tests/ - Test programs.
 * utils/ - Utility programs.


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@487 fefdeb5f-60dc-0310-8127-8f9354f1896f

1 files changed, 278 insertions, 0 deletions

diff --git a/src/modules/module-alsa-source.c b/src/modules/module-alsa-source.c
new file mode 100644
index 00000000..f03e51ad
--- /dev/null
+++ b/src/modules/module-alsa-source.c
@@ -0,0 +1,278 @@
+/* $Id$ */
+
+/***
+  This file is part of polypaudio.
+ 
+  polypaudio is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published
+  by the Free Software Foundation; either version 2 of the License,
+  or (at your option) any later version.
+ 
+  polypaudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+ 
+  You should have received a copy of the GNU Lesser General Public License
+  along with polypaudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+#include <stdio.h>
+
+#ifdef HAVE_SYS_POLL_H
+#include <sys/poll.h>
+#else
+#include "poll.h"
+#endif
+
+#include <asoundlib.h>
+
+#include <polypcore/core.h>
+#include <polypcore/module.h>
+#include <polypcore/memchunk.h>
+#include <polypcore/sink.h>
+#include <polypcore/modargs.h>
+#include <polypcore/util.h>
+#include <polypcore/sample-util.h>
+#include <polypcore/alsa-util.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+
+#include "module-alsa-source-symdef.h"
+
+PA_MODULE_AUTHOR("Lennart Poettering")
+PA_MODULE_DESCRIPTION("ALSA Source")
+PA_MODULE_VERSION(PACKAGE_VERSION)
+PA_MODULE_USAGE("source_name=<name for the source> device=<ALSA device> format=<sample format> channels=<number of channels> rate=<sample rate> fragments=<number of fragments> fragment_size=<fragment size>")
+
+struct userdata {
+    snd_pcm_t *pcm_handle;
+    pa_source *source;
+    pa_io_event **io_events;
+    unsigned n_io_events;
+
+    size_t frame_size, fragment_size;
+    pa_memchunk memchunk;
+    pa_module *module;
+};
+
+static const char* const valid_modargs[] = {
+    "device",
+    "source_name",
+    "channels",
+    "rate",
+    "format",
+    "fragments",
+    "fragment_size",
+    NULL
+};
+
+#define DEFAULT_SOURCE_NAME "alsa_input"
+#define DEFAULT_DEVICE "hw:0,0"
+
+static void update_usage(struct userdata *u) {
+   pa_module_set_used(u->module,
+                      (u->source ? pa_idxset_size(u->source->outputs) : 0));
+}
+
+static void xrun_recovery(struct userdata *u) {
+    assert(u);
+
+    pa_log(__FILE__": *** ALSA-XRUN (capture) ***\n");
+    
+    if (snd_pcm_prepare(u->pcm_handle) < 0)
+        pa_log(__FILE__": snd_pcm_prepare() failed\n");
+}
+
+static void do_read(struct userdata *u) {
+    assert(u);
+
+    update_usage(u);
+    
+    for (;;) {
+        pa_memchunk post_memchunk;
+        snd_pcm_sframes_t frames;
+        size_t l;
+        
+        if (!u->memchunk.memblock) {
+            u->memchunk.memblock = pa_memblock_new(u->memchunk.length = u->fragment_size, u->source->core->memblock_stat);
+            u->memchunk.index = 0;
+        }
+            
+        assert(u->memchunk.memblock && u->memchunk.memblock->data && u->memchunk.length && u->memchunk.memblock->length && (u->memchunk.length % u->frame_size) == 0);
+
+        if ((frames = snd_pcm_readi(u->pcm_handle, (uint8_t*) u->memchunk.memblock->data + u->memchunk.index, u->memchunk.length / u->frame_size)) < 0) {
+            if (frames == -EAGAIN)
+                return;
+            
+            if (frames == -EPIPE) {
+                xrun_recovery(u);
+                continue;
+            }
+
+            pa_log(__FILE__": snd_pcm_readi() failed: %s\n", strerror(-frames));
+            return;
+        }
+
+        l = frames * u->frame_size;
+        
+        post_memchunk = u->memchunk;
+        post_memchunk.length = l;
+
+        pa_source_post(u->source, &post_memchunk);
+
+        u->memchunk.index += l;
+        u->memchunk.length -= l;
+        
+        if (u->memchunk.length == 0) {
+            pa_memblock_unref(u->memchunk.memblock);
+            u->memchunk.memblock = NULL;
+            u->memchunk.index = u->memchunk.length = 0;
+        }
+        
+        break;
+    }
+}
+
+static void io_callback(pa_mainloop_api*a, pa_io_event *e, PA_GCC_UNUSED int fd, PA_GCC_UNUSED pa_io_event_flags_t f, void *userdata) {
+    struct userdata *u = userdata;
+    assert(u && a && e);
+
+    if (snd_pcm_state(u->pcm_handle) == SND_PCM_STATE_XRUN)
+        xrun_recovery(u);
+
+    do_read(u);
+}
+
+static pa_usec_t source_get_latency_cb(pa_source *s) {
+    struct userdata *u = s->userdata;
+    snd_pcm_sframes_t frames;
+    assert(s && u && u->source);
+
+    if (snd_pcm_delay(u->pcm_handle, &frames) < 0) {
+        pa_log(__FILE__": failed to get delay\n");
+        s->get_latency = NULL;
+        return 0;
+    }
+
+    return pa_bytes_to_usec(frames * u->frame_size, &s->sample_spec);
+}
+
+int pa__init(pa_core *c, pa_module*m) {
+    pa_modargs *ma = NULL;
+    int ret = -1;
+    struct userdata *u = NULL;
+    const char *dev;
+    pa_sample_spec ss;
+    unsigned periods, fragsize;
+    snd_pcm_uframes_t period_size;
+    size_t frame_size;
+    int err;
+    
+    if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
+        pa_log(__FILE__": failed to parse module arguments\n");
+        goto fail;
+    }
+
+    ss = c->default_sample_spec;
+    if (pa_modargs_get_sample_spec(ma, &ss) < 0) {
+        pa_log(__FILE__": failed to parse sample specification\n");
+        goto fail;
+    }
+    frame_size = pa_frame_size(&ss);
+    
+    periods = 12;
+    fragsize = 1024;
+    if (pa_modargs_get_value_u32(ma, "fragments", &periods) < 0 || pa_modargs_get_value_u32(ma, "fragment_size", &fragsize) < 0) {
+        pa_log(__FILE__": failed to parse buffer metrics\n");
+        goto fail;
+    }
+    period_size = fragsize;
+    
+    u = pa_xmalloc0(sizeof(struct userdata));
+    m->userdata = u;
+    u->module = m;
+    
+    snd_config_update_free_global();
+    if ((err = snd_pcm_open(&u->pcm_handle, dev = pa_modargs_get_value(ma, "device", DEFAULT_DEVICE), SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK)) < 0) {
+        pa_log(__FILE__": Error opening PCM device %s: %s\n", dev, snd_strerror(err));
+        goto fail;
+    }
+
+    if ((err = pa_alsa_set_hw_params(u->pcm_handle, &ss, &periods, &period_size)) < 0) {
+        pa_log(__FILE__": Failed to set hardware parameters: %s\n", snd_strerror(err));
+        goto fail;
+    }
+
+    u->source = pa_source_new(c, __FILE__, pa_modargs_get_value(ma, "source_name", DEFAULT_SOURCE_NAME), 0, &ss, NULL);
+    assert(u->source);
+
+    u->source->userdata = u;
+    u->source->get_latency = source_get_latency_cb;
+    pa_source_set_owner(u->source, m);
+    u->source->description = pa_sprintf_malloc("Advanced Linux Sound Architecture PCM on '%s'", dev);
+
+    if (pa_create_io_events(u->pcm_handle, c->mainloop, &u->io_events, &u->n_io_events, io_callback, u) < 0) {
+        pa_log(__FILE__": failed to obtain file descriptors\n");
+        goto fail;
+    }
+
+    u->frame_size = frame_size;
+    u->fragment_size = period_size;
+
+    pa_log(__FILE__": using %u fragments of size %u bytes.\n", periods, u->fragment_size);
+
+    u->memchunk.memblock = NULL;
+    u->memchunk.index = u->memchunk.length = 0;
+
+    snd_pcm_start(u->pcm_handle);
+    
+    ret = 0;
+
+finish:
+     if (ma)
+         pa_modargs_free(ma);
+    
+    return ret;
+
+fail:
+    
+    if (u)
+        pa__done(c, m);
+
+    goto finish;
+}
+
+void pa__done(pa_core *c, pa_module*m) {
+    struct userdata *u;
+    assert(c && m);
+
+    if (!(u = m->userdata))
+        return;
+    
+    if (u->source) {
+        pa_source_disconnect(u->source);
+        pa_source_unref(u->source);
+    }
+    
+    if (u->io_events)
+        pa_free_io_events(c->mainloop, u->io_events, u->n_io_events);
+    
+    if (u->pcm_handle) {
+        snd_pcm_drop(u->pcm_handle);
+        snd_pcm_close(u->pcm_handle);
+    }
+    
+    if (u->memchunk.memblock)
+        pa_memblock_unref(u->memchunk.memblock);
+    
+    pa_xfree(u);
+}
+