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

diff --git a/osx_write.c b/osx_write.c
index 73aa1377..2894f11e 100644
--- a/osx_write.c
+++ b/osx_write.c
@@ -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.
@@ -314,7 +318,13 @@ static void osx_write_post_select(__a_unused struct sched *s, struct task *t)
 		if (ret < 0)
 			goto remove_btrn;
 		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 remove_btrn;
+		}
 	}
 	mutex_lock(powd->mutex);
 	ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_INTERNAL);
@@ -322,18 +332,18 @@ static void osx_write_post_select(__a_unused struct sched *s, struct task *t)
 		btr_pushdown(btrn);
 	if (ret < 0 && need_drain_delay(powd))
 		ret = 0;
-	mutex_unlock(powd->mutex);
-
-	if (ret >= 0)
-		goto out;
+	if (ret >= 0) {
+		mutex_unlock(powd->mutex);
+		return;
+	}
 	AudioOutputUnitStop(powd->audio_unit);
 	AudioUnitUninitialize(powd->audio_unit);
 	CloseComponent(powd->audio_unit);
 	btr_remove_node(&powd->callback_btrn);
+	mutex_unlock(powd->mutex);
 remove_btrn:
 	btr_remove_node(&wn->btrn);
 	PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
-out:
 	t->error = ret;
 }