X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oss_write.c;h=d2dc963eaeb03f3b5cc520248109cef0cac6b08b;hp=df9608a8c6a2bbb9b3787df76ce8ec7931604e16;hb=35e284e06a5c8e20d02b61fdcb4bcc20b237c1e4;hpb=7584638594109184f329bead008f1dcdd9030767

diff --git a/oss_write.c b/oss_write.c
index df9608a8..d2dc963e 100644
--- 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.
  */
@@ -9,9 +9,7 @@
 #include <regex.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
-#include <dirent.h>
 #include <sys/soundcard.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "fd.h"
@@ -88,7 +86,6 @@ static int oss_init(struct writer_node *wn, unsigned sample_rate,
 	struct oss_write_args_info *conf = wn->conf;
 	struct private_oss_write_data *powd = para_calloc(sizeof(*powd));
 
-	wn->private_data = powd;
 	PARA_INFO_LOG("opening %s\n", conf->device_arg);
 	ret = para_open(conf->device_arg, O_WRONLY, 0);
 	if (ret < 0)
@@ -149,11 +146,14 @@ static int oss_init(struct writer_node *wn, unsigned sample_rate,
 			sample_rate);
 	}
 	wn->min_iqs = powd->bytes_per_frame;
+	wn->private_data = powd;
 	return 1;
 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;
 }
 
@@ -185,13 +185,13 @@ static void oss_post_select(__a_unused struct sched *s,
 	bytes = btr_next_buffer(btrn, &data);
 	frames = bytes / powd->bytes_per_frame;
 	if (!frames) { /* eof and less than a single frame available */
-		ret = -E_OSS_EOF;
+		ret = -E_WRITE_COMMON_EOF;
 		goto out;
 	}
 	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);
@@ -199,21 +199,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);
 }
 
 /**
@@ -227,16 +227,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);
 }