X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=oss_write.c;h=0565167c256a43bfe86a6442f195a320e1458db8;hb=2bad70d84e763b4d866d7b97dbc1cdc8e030bd45;hp=6f646c904016f92b13ea1b04f4a8cbb9f31243b8;hpb=8d106ca317a2c42f35a86ba244f843688f6939e6;p=paraslash.git

diff --git a/oss_write.c b/oss_write.c
index 6f646c90..0565167c 100644
--- a/oss_write.c
+++ b/oss_write.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2009 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2009 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file oss_write.c Paraslash's oss output plugin. */
 
@@ -61,7 +57,7 @@ static int get_oss_format(enum sample_format sf)
 	case SF_S16_BE: return AFMT_S16_BE;
 	case SF_U16_LE: return AFMT_U16_LE;
 	case SF_U16_BE: return AFMT_U16_BE;
-	default: return AFMT_S16_LE;
+	default: return -E_BAD_SAMPLE_FORMAT;
 	}
 }
 
@@ -117,10 +113,14 @@ static int oss_init(struct writer_node *wn, unsigned sample_rate,
 	if (ret < 0)
 		goto err;
 	/* set PCM format */
-	sample_format = format = get_oss_format(sample_format);
+	ret = get_oss_format(sample_format);
+	if (ret < 0)
+		return ret;
+	sample_format = format = ret;
 	ret = ioctl(powd->fd, SNDCTL_DSP_SETFMT, &format);
 	if (ret < 0) {
 		ret = -ERRNO_TO_PARA_ERROR(errno);
+		PARA_ERROR_LOG("could not set sample format\n");
 		goto err;
 	}
 	ret = -E_BAD_SAMPLE_FORMAT;
@@ -199,9 +199,15 @@ static int oss_post_select(__a_unused struct sched *s, void *context)
 
 		if (sound_device_is_busy())
 			return 0;
-		get_btr_sample_rate(btrn, &rate);
-		get_btr_channels(btrn, &ch);
-		get_btr_sample_format(btrn, &format);
+		ret = get_btr_sample_rate(btrn, &rate);
+		if (ret < 0)
+			goto out;
+		ret = get_btr_channels(btrn, &ch);
+		if (ret < 0)
+			goto out;
+		ret = get_btr_sample_format(btrn, &format);
+		if (ret < 0)
+			goto out;
 		ret = oss_init(wn, rate, ch, format);
 		if (ret < 0)
 			goto out;