gui: Avoid busy loop if audiod is down.

[paraslash.git] / oss_write.c

diff --git a/oss_write.c b/oss_write.c
index 6a55005ec8247a46c424ebabe9308e03f03c1d24..48545630a5d10865c3fc174fdfc7e1bbc6b7c7a6 100644 (file)
--- a/oss_write.c
+++ b/oss_write.c
@@ -47,13 +47,13 @@ static int oss_pre_select(struct sched *s, struct writer_node *wn)
        struct private_oss_write_data *powd = wn->private_data;
        struct writer_node_group *wng = wn->wng;
 
-       if (!*wng->loaded)
+       if (*wng->loaded - wn->written < powd->bytes_per_frame)
                return 0;
        para_fd_set(powd->fd, &s->wfds, &s->max_fileno);
        return 1;
 }
-static int oss_post_select(__a_unused struct sched *s,
-               struct writer_node *wn)
+
+static int oss_post_select(struct sched *s, struct writer_node *wn)
 {
        int ret;
        struct private_oss_write_data *powd = wn->private_data;
@@ -82,7 +82,8 @@ static void oss_close(struct writer_node *wn)
 {
        struct private_oss_write_data *powd = wn->private_data;
 
-       close(powd->fd);
+       if (powd->fd >= 0)
+               close(powd->fd);
        free(powd);
 }
 
@@ -175,7 +176,7 @@ static int oss_open(struct writer_node *wn)
        return 1;
 err:
        close(powd->fd);
-       free(powd);
+       powd->fd = -1;
        return ret;
 }