Fix --with-curses configure option.

[paraslash.git] / oss_write.c

diff --git a/oss_write.c b/oss_write.c
index 05669bb7df4f2eed850d20227d9b8c1225ecb4de..8ca3c525a664b3faf307d5c5d66c6886e7a3c8eb 100644 (file)
--- a/oss_write.c
+++ b/oss_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -152,6 +152,8 @@ err:
        close(powd->fd);
 err_free:
        free(powd);
+       PARA_ERROR_LOG("failed to init %s: %s\n", conf->device_arg,
+               para_strerror(-ret));
        return ret;
 }
 
@@ -162,13 +164,15 @@ static void oss_post_select(__a_unused struct sched *s,
        struct private_oss_write_data *powd = wn->private_data;
        struct btr_node *btrn = wn->btrn;
        size_t frames, bytes;
-       int ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF);
+       int ret;
        char *data;
 
+       ret = task_get_notification(t);
        if (ret < 0)
                goto out;
-       if (ret == 0)
-               return;
+       ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF);
+       if (ret <= 0)
+               goto out;
        if (!powd) {
                int32_t rate, ch, format;
                get_btr_sample_rate(btrn, &rate);
@@ -189,7 +193,7 @@ static void oss_post_select(__a_unused struct sched *s,
        ret = 0;
        if (!FD_ISSET(powd->fd, &s->wfds))
                goto out;
-       ret = write_nonblock(powd->fd, data, frames * powd->bytes_per_frame);
+       ret = xwrite(powd->fd, data, frames * powd->bytes_per_frame);
        if (ret < 0)
                goto out;
        btr_consume(btrn, ret);
@@ -197,21 +201,21 @@ static void oss_post_select(__a_unused struct sched *s,
 out:
        t->error = ret;
        if (ret < 0)
-               btr_remove_node(btrn);
+               btr_remove_node(&wn->btrn);
 }
 
-__malloc static void *oss_parse_config_or_die(const char *options)
+__malloc static void *oss_parse_config_or_die(int argc, char **argv)
 {
        struct oss_write_args_info *conf = para_calloc(sizeof(*conf));
 
        /* exits on errors */
-       oss_cmdline_parser_string(options, conf, "oss_write");
+       oss_write_cmdline_parser(argc, argv, conf);
        return conf;
 }
 
 static void oss_free_config(void *conf)
 {
-       oss_cmdline_parser_free(conf);
+       oss_write_cmdline_parser_free(conf);
 }
 
 /**
@@ -225,16 +229,15 @@ void oss_write_init(struct writer *w)
 {
        struct oss_write_args_info dummy;
 
-       oss_cmdline_parser_init(&dummy);
+       oss_write_cmdline_parser_init(&dummy);
        w->close = oss_close;
        w->pre_select = oss_pre_select;
        w->post_select = oss_post_select;
        w->parse_config_or_die = oss_parse_config_or_die;
        w->free_config = oss_free_config;
-       w->shutdown = NULL;
        w->help = (struct ggo_help) {
                .short_help = oss_write_args_info_help,
                .detailed_help = oss_write_args_info_detailed_help
        };
-       oss_cmdline_parser_free(&dummy);
+       oss_write_cmdline_parser_free(&dummy);
 }