1 files changed, 18 insertions, 59 deletions

diff --git a/src/module-alsa-sink.c b/src/module-alsa-sink.c
index 16571a2c..a0b1e548 100644
--- a/src/module-alsa-sink.c
+++ b/src/module-alsa-sink.c
@@ -11,6 +11,7 @@
 #include "modargs.h"
 #include "util.h"
 #include "sample-util.h"
+#include "alsa-util.h"
 
 struct userdata {
     snd_pcm_t *pcm_handle;
@@ -39,7 +40,7 @@ static const char* const valid_modargs[] = {
 static void xrun_recovery(struct userdata *u) {
     assert(u);
 
-    fprintf(stderr, "*** XRUN ***\n");
+    fprintf(stderr, "*** ALSA-XRUN (playback) ***\n");
     
     if (snd_pcm_prepare(u->pcm_handle) < 0)
         fprintf(stderr, "snd_pcm_prepare() failed\n");
@@ -63,13 +64,10 @@ static void do_write(struct userdata *u) {
             
         assert(memchunk->memblock && memchunk->memblock->data && memchunk->length && memchunk->memblock->length && (memchunk->length % u->frame_size) == 0);
 
-        assert(u->pcm_handle);
-        assert(memchunk->memblock);
-        assert(memchunk->memblock->data);
-        assert(memchunk->length);
-        assert(u->frame_size);
-        
         if ((frames = snd_pcm_writei(u->pcm_handle, memchunk->memblock->data + memchunk->index, memchunk->length / u->frame_size)) < 0) {
+            if (frames == -EAGAIN)
+                return;
+
             if (frames == -EPIPE) {
                 xrun_recovery(u);
                 continue;
@@ -80,8 +78,9 @@ static void do_write(struct userdata *u) {
         }
 
         if (memchunk == &u->memchunk) {
-            memchunk->index += frames * u->frame_size;
-            memchunk->length -= frames * u->frame_size;
+            size_t l = frames * u->frame_size;
+            memchunk->index += l;
+            memchunk->length -= l;
 
             if (memchunk->length == 0) {
                 pa_memblock_unref(memchunk->memblock);
@@ -125,23 +124,11 @@ int pa_module_init(struct pa_core *c, struct pa_module*m) {
     struct pa_modargs *ma = NULL;
     int ret = -1;
     struct userdata *u = NULL;
-    snd_pcm_hw_params_t *hwparams;
     const char *dev;
-    struct pollfd *pfds, *ppfd;
     struct pa_sample_spec ss;
-    unsigned i, periods, fragsize;
+    unsigned periods, fragsize;
     snd_pcm_uframes_t buffer_size;
-    void ** ios;
     size_t frame_size;
-    static const snd_pcm_format_t format_trans[] = {
-        [PA_SAMPLE_U8] = SND_PCM_FORMAT_U8,
-        [PA_SAMPLE_ALAW] = SND_PCM_FORMAT_A_LAW,
-        [PA_SAMPLE_ULAW] = SND_PCM_FORMAT_MU_LAW,
-        [PA_SAMPLE_S16LE] = SND_PCM_FORMAT_S16_LE,
-        [PA_SAMPLE_S16BE] = SND_PCM_FORMAT_S16_BE,
-        [PA_SAMPLE_FLOAT32LE] = SND_PCM_FORMAT_FLOAT_LE,
-        [PA_SAMPLE_FLOAT32BE] = SND_PCM_FORMAT_FLOAT_BE,
-    };
     
     if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
         fprintf(stderr, __FILE__": failed to parse module arguments\n");
@@ -169,20 +156,12 @@ int pa_module_init(struct pa_core *c, struct pa_module*m) {
     m->userdata = u;
     
     if (snd_pcm_open(&u->pcm_handle, dev = pa_modargs_get_value(ma, "device", DEFAULT_DEVICE), SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK) < 0) {
-        fprintf(stderr, "Error opening PCM device %s\n", dev);
+        fprintf(stderr, __FILE__": Error opening PCM device %s\n", dev);
         goto fail;
     }
 
-    snd_pcm_hw_params_alloca(&hwparams);
-    if (snd_pcm_hw_params_any(u->pcm_handle, hwparams) < 0 ||
-        snd_pcm_hw_params_set_access(u->pcm_handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED) < 0 ||
-        snd_pcm_hw_params_set_format(u->pcm_handle, hwparams, format_trans[ss.format]) < 0 ||
-        snd_pcm_hw_params_set_rate_near(u->pcm_handle, hwparams, &ss.rate, NULL) < 0 ||
-        snd_pcm_hw_params_set_channels(u->pcm_handle, hwparams, ss.channels) < 0 ||
-        snd_pcm_hw_params_set_periods_near(u->pcm_handle, hwparams, &periods, NULL) < 0 || 
-        snd_pcm_hw_params_set_buffer_size_near(u->pcm_handle, hwparams, &buffer_size) < 0 || 
-        snd_pcm_hw_params(u->pcm_handle, hwparams) < 0) {
-        fprintf(stderr, "Error setting HW params.\n");
+    if (pa_alsa_set_hw_params(u->pcm_handle, &ss, &periods, &buffer_size) < 0) {
+        fprintf(stderr, __FILE__": Failed to set hardware parameters\n");
         goto fail;
     }
 
@@ -194,28 +173,11 @@ int pa_module_init(struct pa_core *c, struct pa_module*m) {
     pa_sink_set_owner(u->sink, m);
     u->sink->description = pa_sprintf_malloc("Advanced Linux Sound Architecture PCM on '%s'", dev);
 
-    u->n_io_sources = snd_pcm_poll_descriptors_count(u->pcm_handle);
-
-    pfds = malloc(sizeof(struct pollfd) * u->n_io_sources);
-    assert(pfds);
-    if (snd_pcm_poll_descriptors(u->pcm_handle, pfds, u->n_io_sources) < 0) {
-        printf("Unable to obtain poll descriptors for playback.\n");
-        free(pfds);
+    if (pa_create_io_sources(u->pcm_handle, c->mainloop, &u->io_sources, &u->n_io_sources, io_callback, u) < 0) {
+        fprintf(stderr, __FILE__": failed to obtain file descriptors\n");
         goto fail;
     }
     
-    u->io_sources = malloc(sizeof(void*) * u->n_io_sources);
-    assert(u->io_sources);
-
-    for (i = 0, ios = u->io_sources, ppfd = pfds; i < u->n_io_sources; i++, ios++, ppfd++) {
-        *ios = c->mainloop->source_io(c->mainloop, ppfd->fd,
-                                      ((ppfd->events & POLLIN) ? PA_MAINLOOP_API_IO_EVENT_INPUT : 0) |
-                                      ((ppfd->events & POLLOUT) ? PA_MAINLOOP_API_IO_EVENT_OUTPUT : 0), io_callback, u);
-        assert(*ios);
-    }
-
-    free(pfds);
-
     u->frame_size = frame_size;
     u->fragment_size = buffer_size*u->frame_size/periods;
 
@@ -250,14 +212,11 @@ void pa_module_done(struct pa_core *c, struct pa_module*m) {
     assert(c && m);
 
     if ((u = m->userdata)) {
-        unsigned i;
-        void **ios;
-        
-        pa_sink_free(u->sink);
+        if (u->sink)
+            pa_sink_free(u->sink);
 
-        for (ios = u->io_sources, i = 0; i < u->n_io_sources; i++, ios++)
-            c->mainloop->cancel_io(c->mainloop, *ios);
-        free(u->io_sources);
+        if (u->io_sources)
+            pa_free_io_sources(c->mainloop, u->io_sources, u->n_io_sources);
         
         if (u->pcm_handle) {
             snd_pcm_drop(u->pcm_handle);