From 100e73de5a8f9898f65b37a7182f9f3145d47508 Mon Sep 17 00:00:00 2001 From: Matthew Gregan Date: Sun, 6 Nov 2016 11:51:33 +1300 Subject: [PATCH] Bug 1315495 - Update libcubeb to 98b189d2. r=achronop --- media/libcubeb/README_MOZILLA | 2 +- media/libcubeb/src/cubeb_utils.h | 14 -------------- media/libcubeb/src/cubeb_wasapi.cpp | 5 ++++- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/media/libcubeb/README_MOZILLA b/media/libcubeb/README_MOZILLA index d5dec274bf09..b5121190c30b 100644 --- a/media/libcubeb/README_MOZILLA +++ b/media/libcubeb/README_MOZILLA @@ -5,4 +5,4 @@ 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 8c41e5641df50a4b78650057872178a5860222f0. +The git commit ID used was 98b189d2aad06bef758a5ae76fb758fa4dfa9bba. diff --git a/media/libcubeb/src/cubeb_utils.h b/media/libcubeb/src/cubeb_utils.h index 8e762856ead0..d8e9928fe2d4 100644 --- a/media/libcubeb/src/cubeb_utils.h +++ b/media/libcubeb/src/cubeb_utils.h @@ -212,18 +212,4 @@ private: owned_critical_section & lock; }; -struct auto_unlock { - explicit auto_unlock(owned_critical_section & lock) - : lock(lock) - { - lock.leave(); - } - ~auto_unlock() - { - lock.enter(); - } -private: - owned_critical_section & lock; -}; - #endif /* CUBEB_UTILS */ diff --git a/media/libcubeb/src/cubeb_wasapi.cpp b/media/libcubeb/src/cubeb_wasapi.cpp index cc970c60eed4..042f92d59fe0 100644 --- a/media/libcubeb/src/cubeb_wasapi.cpp +++ b/media/libcubeb/src/cubeb_wasapi.cpp @@ -1748,11 +1748,14 @@ void close_wasapi_stream(cubeb_stream * stm) SafeRelease(stm->output_client); stm->output_client = NULL; SafeRelease(stm->input_client); - stm->capture_client = NULL; + stm->input_client = NULL; SafeRelease(stm->render_client); stm->render_client = NULL; + SafeRelease(stm->capture_client); + stm->capture_client = NULL; + SafeRelease(stm->audio_stream_volume); stm->audio_stream_volume = NULL;