Fix a gcc warning in alsa_open() on x86_64.

[paraslash.git] / alsa_write.c

diff --git a/alsa_write.c b/alsa_write.c
index 8e8b693c2f99752ea2ce1d9b7481084d6dcb0150..cfae4fb9e20b322e36764d92806ba9f842ed1b0a 100644 (file)
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -41,7 +41,7 @@ struct private_alsa_write_data {
        /**
         * the samplerate given by command line option or the decoder
         * of the writer node group
-        */
+        */
        unsigned samplerate;
        /**
         * the number of channels, also given by command line option or the
@@ -133,8 +133,9 @@ static int alsa_open(struct writer_node *w)
                return -E_SW_PARAMS;
        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);
        if (snd_pcm_nonblock(pad->handle, 1))
-               PARA_ERROR_LOG("%s\n", "failed to set nonblock mode");
+               PARA_ERROR_LOG("failed to set nonblock mode\n");
        return period_size * pad->bytes_per_frame;
 }
 
@@ -186,14 +187,16 @@ static int alsa_write_post_select(__a_unused struct sched *s,
                        frames, (int)ret);
                return -E_ALSA_WRITE;
        }
-       if (ret == -EAGAIN) { /* try again in 5ms */
-               PARA_WARNING_LOG("EAGAIN\n");
-               ms2tv(5, &tv);
-       } else {
+       if (ret == -EAGAIN)
+               PARA_DEBUG_LOG("EAGAIN\n");
+       else
                wn->written += ret * pad->bytes_per_frame;
-               ms2tv(pad->buffer_time / 4000, &tv);
+       if (ret == frames) /* we wrote everything, try again immediately */
+               pad->next_chunk = *now;
+       else {
+               ms2tv(pad->buffer_time / pad->bytes_per_frame / 1000, &tv);
+               tv_add(now, &tv, &pad->next_chunk);
        }
-       tv_add(now, &tv, &pad->next_chunk);
        return 1;
 }