Bug 805352 - Make cubeb_stream_destroy errors non-fatal in AudioUnit backend. r=doublec
authorMatthew Gregan <kinetik@flim.org>
Fri, 26 Oct 2012 17:09:12 +1300
changeset 111614 5a4073fa0bbb7556d2c1ea4dd9ef5c0d73399e0d
parent 111613 56ea8204864df62e250ebc18ab44d8b3c82f077a
child 111615 c229f8853f4d4b035cd4c22bf06e17266d3400e6
push id93
push usernmatsakis@mozilla.com
push dateWed, 31 Oct 2012 21:26:57 +0000
reviewersdoublec
bugs805352
milestone19.0a1
Bug 805352 - Make cubeb_stream_destroy errors non-fatal in AudioUnit backend. r=doublec
media/libcubeb/README_MOZILLA
media/libcubeb/src/cubeb_audiounit.c
--- a/media/libcubeb/README_MOZILLA
+++ b/media/libcubeb/README_MOZILLA
@@ -3,8 +3,9 @@ git repository using the update.sh scrip
 made were those applied by update.sh and the addition of
 Makefile.in build files for the Mozilla build system.
 
 The cubeb git repository is: git://github.com/kinetiknz/cubeb.git
 
 The git commit ID used was 2d7d3e8f2ecabb70d2723f3c86fcb591a84b7f85.
 Plus the single commit f4c927fb1c2dc0a0580d0bca4bd267c34febada4.
 Plus the single commit 1e54b689752a1e853828cb4124985d3160694913.
+Plus the single commit e5837ecbb2389abd7e6635f4339878c5e4c1e1d5.
--- a/media/libcubeb/src/cubeb_audiounit.c
+++ b/media/libcubeb/src/cubeb_audiounit.c
@@ -217,29 +217,24 @@ cubeb_stream_init(cubeb * context, cubeb
   *stream = stm;
 
   return CUBEB_OK;
 }
 
 void
 cubeb_stream_destroy(cubeb_stream * stm)
 {
-  OSStatus r;
+  int r;
 
   stm->shutdown = 1;
 
   if (stm->unit) {
-    r = AudioOutputUnitStop(stm->unit);
-    assert(r == 0);
-
-    r = AudioUnitUninitialize(stm->unit);
-    assert(r == 0);
-
-    r = CloseComponent(stm->unit);
-    assert(r == 0);
+    AudioOutputUnitStop(stm->unit);
+    AudioUnitUninitialize(stm->unit);
+    CloseComponent(stm->unit);
   }
 
   r = pthread_mutex_destroy(&stm->mutex);
   assert(r == 0);
 
   free(stm);
 }