Bug 1372057 - Limit pulse-rust to nightly builds. r?kinetik draft
authorDan Glastonbury <dan.glastonbury@gmail.com>
Mon, 12 Jun 2017 11:26:33 +1000
changeset 592300 f761c84303b88b8010fdddc0772adbcb0c399ca2
parent 592285 981da978f1f686ad024fa958c9d27d2f8acc5ad0
child 632767 71924551ac2e2189813075e6547722e705eff546
push id63331
push userbmo:dglastonbury@mozilla.com
push dateMon, 12 Jun 2017 01:27:40 +0000
reviewerskinetik
bugs1372057
milestone55.0a1
Bug 1372057 - Limit pulse-rust to nightly builds. r?kinetik MozReview-Commit-ID: Ev4GSuEN5Xa
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(USE_PULSE_RUST)
++#if defined(NIGHTLY_BUILD) && 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(USE_PULSE_RUST)
+#if defined(NIGHTLY_BUILD) && defined(USE_PULSE_RUST)
     pulse_rust_init,
 #endif
 #if defined(USE_PULSE)
     pulse_init,
 #endif
 #if defined(USE_JACK)
     jack_init,
 #endif