From 49e90dfa545ba69fe27dd3d38063ff3795d3f6ac Mon Sep 17 00:00:00 2001
From: Matthew Gregan <kinetik@flim.org>
Date: Fri, 17 May 2019 09:27:50 +1200
Subject: [PATCH] Bug 1552342 - Update libcubeb to b9e2c50.  r=padenot

---
 media/libcubeb/disable-device-switching.patch | 79 -------------------
 media/libcubeb/moz.yaml                       |  2 +-
 media/libcubeb/update.sh                      |  3 -
 3 files changed, 1 insertion(+), 83 deletions(-)
 delete mode 100644 media/libcubeb/disable-device-switching.patch

diff --git a/media/libcubeb/disable-device-switching.patch b/media/libcubeb/disable-device-switching.patch
deleted file mode 100644
index 630a21f5c8b0..000000000000
--- a/media/libcubeb/disable-device-switching.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/media/libcubeb/src/cubeb_wasapi.cpp b/media/libcubeb/src/cubeb_wasapi.cpp
---- a/media/libcubeb/src/cubeb_wasapi.cpp
-+++ b/media/libcubeb/src/cubeb_wasapi.cpp
-@@ -1829,21 +1829,26 @@ wasapi_stream_init(cubeb * context, cube
-        assert that the lock is held in the function. */
-     auto_lock lock(stm->stream_reset_lock);
-     rv = setup_wasapi_stream(stm.get());
-   }
-   if (rv != CUBEB_OK) {
-     return rv;
-   }
- 
--  HRESULT hr = register_notification_client(stm.get());
--  if (FAILED(hr)) {
--    /* this is not fatal, we can still play audio, but we won't be able
--       to keep using the default audio endpoint if it changes. */
--    LOG("failed to register notification client, %lx", hr);
-+  if (!((input_stream_params ?
-+         (input_stream_params->prefs & CUBEB_STREAM_PREF_DISABLE_DEVICE_SWITCHING) : 0) ||
-+        (output_stream_params ?
-+         (output_stream_params->prefs & CUBEB_STREAM_PREF_DISABLE_DEVICE_SWITCHING) : 0))) {
-+    HRESULT hr = register_notification_client(stm.get());
-+    if (FAILED(hr)) {
-+      /* this is not fatal, we can still play audio, but we won't be able
-+         to keep using the default audio endpoint if it changes. */
-+      LOG("failed to register notification client, %lx", hr);
-+    }
-   }
- 
-   *stream = stm.release();
- 
-   LOG("Stream init succesfull (%p)", *stream);
-   return CUBEB_OK;
- }
- 
-@@ -1879,17 +1884,19 @@ void wasapi_stream_destroy(cubeb_stream 
-   // Only free stm->emergency_bailout if we could join the thread.
-   // If we could not join the thread, stm->emergency_bailout is true
-   // and is still alive until the thread wakes up and exits cleanly.
-   if (stop_and_join_render_thread(stm)) {
-     delete stm->emergency_bailout.load();
-     stm->emergency_bailout = nullptr;
-   }
- 
--  unregister_notification_client(stm);
-+  if (stm->notification_client) {
-+    unregister_notification_client(stm);
-+  }
- 
-   CloseHandle(stm->reconfigure_event);
-   CloseHandle(stm->refill_event);
-   CloseHandle(stm->input_available_event);
- 
-   // The variables intialized in wasapi_stream_init,
-   // must be destroyed in wasapi_stream_destroy.
-   stm->linear_input_buffer.reset();
-diff --git a/media/libcubeb/include/cubeb.h b/media/libcubeb/include/cubeb.h
---- a/media/libcubeb/include/cubeb.h
-+++ a/media/libcubeb/include/cubeb.h
-@@ -222,16 +222,19 @@
- 
- /** Miscellaneous stream preferences. */
- typedef enum {
-   CUBEB_STREAM_PREF_NONE     = 0x00, /**< No stream preferences are requested. */
-   CUBEB_STREAM_PREF_LOOPBACK = 0x01, /**< Request a loopback stream. Should be
-                                          specified on the input params and an
-                                          output device to loopback from should
-                                          be passed in place of an input device. */
-+  CUBEB_STREAM_PREF_DISABLE_DEVICE_SWITCHING = 0x02, /**< Disable switching
-+                                                          default device on OS
-+                                                          changes. */
-   CUBEB_STREAM_PREF_VOICE = 0x04  /**< This stream is going to transport voice data.
-                                        Depending on the backend and platform, this can
-                                        change the audio input or output devices
-                                        selected, as well as the quality of the stream,
-                                        for example to accomodate bluetooth SCO modes on
-                                        bluetooth devices. */
- } cubeb_stream_prefs;
- 
diff --git a/media/libcubeb/moz.yaml b/media/libcubeb/moz.yaml
index 370a4c27052c..309770641255 100644
--- a/media/libcubeb/moz.yaml
+++ b/media/libcubeb/moz.yaml
@@ -19,5 +19,5 @@ origin:
   license: "ISC"
 
   # update.sh will update this value
-  release: "64aa80f330a3dc510b1e3ac0e92cc6bed129a9a6 (2019-04-25 17:32:33 +0200)"
+  release: "b9e2c50e51fc58b31b553b5364efacec24ebb76e (2019-05-17 09:21:59 +1200)"
 
diff --git a/media/libcubeb/update.sh b/media/libcubeb/update.sh
index 08f91d2ac31d..3e36ba99c167 100755
--- a/media/libcubeb/update.sh
+++ b/media/libcubeb/update.sh
@@ -90,6 +90,3 @@ fi
 
 echo "Applying disable-assert.patch on top of $rev"
 patch -p3 < disable-assert.patch
-
-echo "Applying disable-device-switching.patch on top of $rev"
-patch -p3 < disable-device-switching.patch