Bug 1430996 - P2: Remove NIGHTLY_BUILD restriction for using cubeb-pulse-rs. r?kinetik draft
authorDan Glastonbury <dglastonbury@mozilla.com>
Wed, 17 Jan 2018 16:22:54 +1000
changeset 721894 64c13c9d05e233d78f7729a92553ee5efef19ee8
parent 721893 13080e6982a9ad0ec328f064d680b3965f0e25ab
child 746472 0ff5f8386f7ffd597dc842fd9357d9f1e0e9e9c8
push id95987
push userbmo:dglastonbury@mozilla.com
push dateThu, 18 Jan 2018 01:37:19 +0000
reviewerskinetik
bugs1430996
milestone59.0a1
Bug 1430996 - P2: Remove NIGHTLY_BUILD restriction for using cubeb-pulse-rs. r?kinetik MozReview-Commit-ID: 6luTT4b9e25
media/libcubeb/prefer-pulse-rust.patch
media/libcubeb/src/cubeb.c
--- a/media/libcubeb/prefer-pulse-rust.patch
+++ b/media/libcubeb/prefer-pulse-rust.patch
@@ -1,14 +1,14 @@
 diff --git a/media/libcubeb/src/cubeb.c b/media/libcubeb/src/cubeb.c
 index 1db59240e335..241f3cfed041 100644
 --- a/media/libcubeb/src/cubeb.c
 +++ b/media/libcubeb/src/cubeb.c
 @@ -166,6 +166,9 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam
       * to override all other choices
       */
      init_oneshot,
-+#if defined(NIGHTLY_BUILD) && defined(USE_PULSE_RUST)
++#if defined(USE_PULSE_RUST)
 +    pulse_rust_init,
 +#endif
  #if defined(USE_PULSE)
      pulse_init,
  #endif
--- a/media/libcubeb/src/cubeb.c
+++ b/media/libcubeb/src/cubeb.c
@@ -161,17 +161,17 @@ cubeb_init(cubeb ** context, char const 
   }
 
   int (* default_init[])(cubeb **, char const *) = {
     /*
      * init_oneshot must be at the top to allow user
      * to override all other choices
      */
     init_oneshot,
-#if defined(NIGHTLY_BUILD) && defined(USE_PULSE_RUST)
+#if defined(USE_PULSE_RUST)
     pulse_rust_init,
 #endif
 #if defined(USE_PULSE)
     pulse_init,
 #endif
 #if defined(USE_JACK)
     jack_init,
 #endif