audiounit: make unit initialization failures non-fatal.

1 files changed, 24 insertions, 10 deletions

diff --git a/src/cubeb_audiounit.c b/src/cubeb_audiounit.c
index fff0130..9fd46c4 100644
--- a/src/cubeb_audiounit.c
+++ b/src/cubeb_audiounit.c
@@ -181,17 +181,26 @@ cubeb_stream_init(cubeb * context, cubeb_stream ** stream, char const * stream_n
   stm->frames_queued = 0;
 
   r = OpenAComponent(comp, &stm->unit);
-  assert(r == 0);
+  if (r != 0) {
+    cubeb_stream_destroy(stm);
+    return CUBEB_ERROR;
+  }
 
   input.inputProc = audio_unit_output_callback;
   input.inputProcRefCon = stm;
   r = AudioUnitSetProperty(stm->unit, kAudioUnitProperty_SetRenderCallback,
                            kAudioUnitScope_Global, 0, &input, sizeof(input));
-  assert(r == 0);
+  if (r != 0) {
+    cubeb_stream_destroy(stm);
+    return CUBEB_ERROR;
+  }
 
   r = AudioUnitSetProperty(stm->unit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input,
                            0, &ss, sizeof(ss));
-  assert(r == 0);
+  if (r != 0) {
+    cubeb_stream_destroy(stm);
+    return CUBEB_ERROR;
+  }
 
   buffer_size = ss.mSampleRate / 1000.0 * latency * ss.mBytesPerFrame / NBUFS;
   if (buffer_size % ss.mBytesPerFrame != 0) {
@@ -200,7 +209,10 @@ cubeb_stream_init(cubeb * context, cubeb_stream ** stream, char const * stream_n
   assert(buffer_size % ss.mBytesPerFrame == 0);
 
   r = AudioUnitInitialize(stm->unit);
-  assert(r == 0);
+  if (r != 0) {
+    cubeb_stream_destroy(stm);
+    return CUBEB_ERROR;
+  }
 
   *stream = stm;
 
@@ -214,14 +226,16 @@ cubeb_stream_destroy(cubeb_stream * stm)
 
   stm->shutdown = 1;
 
-  r = AudioOutputUnitStop(stm->unit);
-  assert(r == 0);
+  if (stm->unit) {
+    r = AudioOutputUnitStop(stm->unit);
+    assert(r == 0);
 
-  r = AudioUnitUninitialize(stm->unit);
-  assert(r == 0);
+    r = AudioUnitUninitialize(stm->unit);
+    assert(r == 0);
 
-  r = CloseComponent(stm->unit);
-  assert(r == 0);
+    r = CloseComponent(stm->unit);
+    assert(r == 0);
+  }
 
   r = pthread_mutex_destroy(&stm->mutex);
   assert(r == 0);