X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oss_write.c;h=f1e901993120008eb67a221c438b1b3f5c3a3c10;hp=090f990565ce10b7eb85bd8dde2c391c132797c4;hb=52071c963c318f979fd1ba37ba4dc4523c65d428;hpb=877c179023ba45d481e9d89ac82fb0856617587b

diff --git a/oss_write.c b/oss_write.c
index 090f9905..f1e90199 100644
--- a/oss_write.c
+++ b/oss_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2010 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);