audiod: Change return value of open_current_receiver() to void.

[paraslash.git] / alsa_write.c

diff --git a/alsa_write.c b/alsa_write.c
index 9f60d6d88aacbd21715f529d61c5bd3e23dd6cd4..f016e6ff74aeb16dcc764d0b482764e347fd60b1 100644 (file)
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -131,7 +131,7 @@ 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: %zu\n", pad->bytes_per_frame);
@@ -181,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) {
@@ -247,8 +249,6 @@ void alsa_write_init(struct writer *w)
        w->parse_config = alsa_parse_config;
        w->shutdown = NULL; /* nothing to do */
        w->help = (struct ggo_help) {
-               .purpose = alsa_write_args_info_purpose,
-               .usage = alsa_write_args_info_usage,
                .short_help = alsa_write_args_info_help,
                .detailed_help = alsa_write_args_info_detailed_help
        };