X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=osx_write.c;h=d38e2fb1d0ebc2d650060677a70b878337f135d3;hp=73aa137732a61c57cab41a2f9f1532008ae652c9;hb=fdb9d26edf7ef38c4213e23b6bf1ee89d287cb9e;hpb=97902a38295b1f154e9aade2f54427fdb66b3d93

diff --git a/osx_write.c b/osx_write.c
index 73aa1377..d38e2fb1 100644
--- a/osx_write.c
+++ b/osx_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -78,10 +78,14 @@ static OSStatus osx_callback(void *cb_arg, __a_unused AudioUnitRenderActionFlags
 {
 	int i;
 	struct writer_node *wn = cb_arg;
-	struct private_osx_write_data *powd = wn->private_data;
+	struct private_osx_write_data *powd;
 	size_t samples_have, samples_want = 0;
 
+	powd = wn->private_data;
 	mutex_lock(powd->mutex);
+	powd = wn->private_data;
+	if (!powd || !wn->btrn)
+		goto out;
 	/*
 	 * We fill with zeros if no data was yet written and we do not have
 	 * enough to fill all buffers.
@@ -304,17 +308,26 @@ static void osx_write_post_select(__a_unused struct sched *s, struct task *t)
 	struct btr_node *btrn = wn->btrn;
 	int ret;
 
+	ret = task_get_notification(t);
+	if (ret < 0)
+		goto fail;
 	if (!powd) {
 		ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF);
 		if (ret == 0)
 			return;
 		if (ret < 0)
-			goto remove_btrn;
+			goto fail;
 		ret = core_audio_init(wn);
 		if (ret < 0)
-			goto remove_btrn;
+			goto fail;
 		powd = wn->private_data;
-		AudioOutputUnitStart(powd->audio_unit);
+		ret = -E_UNIT_START;
+		if (AudioOutputUnitStart(powd->audio_unit) != noErr) {
+			AudioUnitUninitialize(powd->audio_unit);
+			CloseComponent(powd->audio_unit);
+			btr_remove_node(&powd->callback_btrn);
+			goto fail;
+		}
 	}
 	mutex_lock(powd->mutex);
 	ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_INTERNAL);
@@ -323,17 +336,18 @@ static void osx_write_post_select(__a_unused struct sched *s, struct task *t)
 	if (ret < 0 && need_drain_delay(powd))
 		ret = 0;
 	mutex_unlock(powd->mutex);
-
 	if (ret >= 0)
-		goto out;
-	AudioOutputUnitStop(powd->audio_unit);
-	AudioUnitUninitialize(powd->audio_unit);
-	CloseComponent(powd->audio_unit);
-	btr_remove_node(&powd->callback_btrn);
-remove_btrn:
+		return;
+fail:
+	assert(ret < 0);
+	if (powd && powd->callback_btrn) {
+		AudioOutputUnitStop(powd->audio_unit);
+		AudioUnitUninitialize(powd->audio_unit);
+		CloseComponent(powd->audio_unit);
+		btr_remove_node(&powd->callback_btrn);
+	}
 	btr_remove_node(&wn->btrn);
 	PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
-out:
 	t->error = ret;
 }