From ab37fcf70441a45d734e9816d8e30d97a81566fc Mon Sep 17 00:00:00 2001 From: Matthew Gregan Date: Sun, 26 Aug 2018 20:34:41 +1200 Subject: [PATCH] Bug 1471922 - Update cubeb-pulse-rs to 79886477. r=kamidphish --HG-- extra : rebase_source : 5ecf7036ff47adb36f55d8578e484154a81f7e95 --- media/libcubeb/cubeb-pulse-rs/README_MOZILLA | 2 +- media/libcubeb/cubeb-pulse-rs/src/backend/context.rs | 4 +++- media/libcubeb/cubeb-pulse-rs/src/backend/stream.rs | 8 ++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/media/libcubeb/cubeb-pulse-rs/README_MOZILLA b/media/libcubeb/cubeb-pulse-rs/README_MOZILLA index 259be71b228d..5b2a42ce7d71 100644 --- a/media/libcubeb/cubeb-pulse-rs/README_MOZILLA +++ b/media/libcubeb/cubeb-pulse-rs/README_MOZILLA @@ -5,4 +5,4 @@ Makefile.in build files for the Mozilla build system. The cubeb-pulse-rs git repository is: https://github.com/djg/cubeb-pulse-rs.git -The git commit ID used was d0bdf51ebd0a653cc4276d2346db852a3060ade0 (2018-06-29 10:09:52 +1000) +The git commit ID used was 798864774d7b9e65e8327ba87a753254afa3da6e (2018-07-24 14:13:11 +1000) diff --git a/media/libcubeb/cubeb-pulse-rs/src/backend/context.rs b/media/libcubeb/cubeb-pulse-rs/src/backend/context.rs index 088651f8cc86..1435a3e27737 100644 --- a/media/libcubeb/cubeb-pulse-rs/src/backend/context.rs +++ b/media/libcubeb/cubeb-pulse-rs/src/backend/context.rs @@ -486,7 +486,9 @@ impl ContextOps for PulseContext { fn success(_: &pulse::Context, success: i32, user_data: *mut c_void) { let ctx = unsafe { &*(user_data as *mut PulseContext) }; - debug_assert_ne!(success, 0); + if success != 1 { + cubeb_log!("subscribe_success ignored failure: {}", success); + } ctx.mainloop.signal(); } diff --git a/media/libcubeb/cubeb-pulse-rs/src/backend/stream.rs b/media/libcubeb/cubeb-pulse-rs/src/backend/stream.rs index 96bee058f0b6..950de7596c00 100644 --- a/media/libcubeb/cubeb-pulse-rs/src/backend/stream.rs +++ b/media/libcubeb/cubeb-pulse-rs/src/backend/stream.rs @@ -902,13 +902,17 @@ impl<'ctx> PulseStream<'ctx> { fn stream_success(_: &pulse::Stream, success: i32, u: *mut c_void) { let stm = unsafe { &*(u as *mut PulseStream) }; - debug_assert_ne!(success, 0); + if success != 1 { + cubeb_log!("stream_success ignored failure: {}", success); + } stm.context.mainloop.signal(); } fn context_success(_: &pulse::Context, success: i32, u: *mut c_void) { let ctx = unsafe { &*(u as *mut PulseContext) }; - debug_assert_ne!(success, 0); + if success != 1 { + cubeb_log!("context_success ignored failure: {}", success); + } ctx.mainloop.signal(); }