alsa_write: Handle EPIPE errors properly.

[paraslash.git] / alsa_write.c

diff --git a/alsa_write.c b/alsa_write.c
index 0f0f1f7d152ef7d3d0b2086f64ffd4f45de2b283..f016e6ff74aeb16dcc764d0b482764e347fd60b1 100644 (file)
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -21,6 +21,7 @@
 #include "string.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "write.h"
 #include "alsa_write.cmdline.h"
 #include "error.h"
@@ -130,10 +131,10 @@ static int alsa_open(struct writer_node *w)
                        stop_threshold) < 0)
                return -E_STOP_THRESHOLD;
        if (snd_pcm_sw_params(pad->handle, swparams) < 0)
-               return -E_SW_PARAMS;
+               PARA_WARNING_LOG("unable to install sw params\n");
        pad->bytes_per_frame = snd_pcm_format_physical_width(FORMAT)
                * pad->channels / 8;
-       PARA_INFO_LOG("bytes per frame: %d\n", pad->bytes_per_frame);
+       PARA_INFO_LOG("bytes per frame: %zu\n", pad->bytes_per_frame);
        if (snd_pcm_nonblock(pad->handle, 1))
                PARA_ERROR_LOG("failed to set nonblock mode\n");
        return period_size * pad->bytes_per_frame;
@@ -180,6 +181,8 @@ static int alsa_write_post_select(__a_unused struct sched *s,
        if (ret == -EPIPE) {
                PARA_WARNING_LOG("EPIPE\n");
                snd_pcm_prepare(pad->handle);
+               /* try to write the same data again */
+               ret = snd_pcm_writei(pad->handle, data, frames);
                return 1;
        }
        if (ret < 0 && ret != -EAGAIN) {
@@ -212,10 +215,12 @@ static void alsa_close(struct writer_node *wn)
 
 __malloc static void *alsa_parse_config(const char *options)
 {
+       int ret;
        struct alsa_write_args_info *conf
                = para_calloc(sizeof(struct alsa_write_args_info));
+
        PARA_INFO_LOG("options: %s, %zd\n", options, strcspn(options, " \t"));
-       int ret = alsa_cmdline_parser_string(options, conf, "alsa_write");
+       ret = alsa_cmdline_parser_string(options, conf, "alsa_write");
        if (ret)
                goto err_out;
        PARA_INFO_LOG("help given: %d\n", conf->help_given);
@@ -234,10 +239,17 @@ err_out:
  */
 void alsa_write_init(struct writer *w)
 {
+       struct alsa_write_args_info dummy;
+
+       alsa_cmdline_parser_init(&dummy);
        w->open = alsa_open;
        w->close = alsa_close;
        w->pre_select = alsa_write_pre_select;
        w->post_select = alsa_write_post_select;
        w->parse_config = alsa_parse_config;
        w->shutdown = NULL; /* nothing to do */
+       w->help = (struct ggo_help) {
+               .short_help = alsa_write_args_info_help,
+               .detailed_help = alsa_write_args_info_detailed_help
+       };
 }