# HG changeset patch
# User Bryce Van Dyk <bvandyk@mozilla.com>
# Date 1517238141 18000
#      Mon Jan 29 10:02:21 2018 -0500
# Node ID 37d7c64a30a17285432bf339902d3cb18dd4eb21
# Parent  a777ecc6961233c4aaa23c3977aed9372d1e00aa
Bug 1432869 - Update media/audioipc to d779860.  r=kamidphish

MozReview-Commit-ID: 4p88aHw9B91

diff --git a/media/audioipc/README_MOZILLA b/media/audioipc/README_MOZILLA
--- a/media/audioipc/README_MOZILLA
+++ b/media/audioipc/README_MOZILLA
@@ -1,8 +1,8 @@
 The source from this directory was copied from the audioipc-2
 git repository using the update.sh script.  The only changes
 made were those applied by update.sh and the addition of
 Makefile.in build files for the Mozilla build system.
 
 The audioipc-2 git repository is: https://github.com/djg/audioipc-2.git
 
-The git commit ID used was 71cc67f44b803e0288997247c060375196f1cf9b (2018-01-19 17:16:33 +1000)
+The git commit ID used was d7798606aa590ef402344b7a519a0053725a9805 (2018-01-27 09:07:03 +1000)
diff --git a/media/audioipc/audioipc/Cargo.toml b/media/audioipc/audioipc/Cargo.toml
--- a/media/audioipc/audioipc/Cargo.toml
+++ b/media/audioipc/audioipc/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "audioipc"
-version = "0.2.0"
+version = "0.2.1"
 authors = [
         "Matthew Gregan <kinetik@flim.org>",
         "Dan Glastonbury <dan.glastonbury@gmail.com>"
         ]
 description = "Remote Cubeb IPC"
 
 [dependencies]
 cubeb-core = { path = "../../cubeb-rs/cubeb-core" }
diff --git a/media/audioipc/audioipc/src/messages.rs b/media/audioipc/audioipc/src/messages.rs
--- a/media/audioipc/audioipc/src/messages.rs
+++ b/media/audioipc/audioipc/src/messages.rs
@@ -117,39 +117,42 @@ impl From<DeviceInfo> for ffi::cubeb_dev
     }
 }
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct StreamParams {
     pub format: u32,
     pub rate: u16,
     pub channels: u8,
-    pub layout: i32
+    pub layout: i32,
+    pub prefs: i32
 }
 
 impl<'a> From<&'a ffi::cubeb_stream_params> for StreamParams {
     fn from(params: &'a ffi::cubeb_stream_params) -> Self {
         assert!(params.channels <= u32::from(u8::max_value()));
 
         StreamParams {
             format: params.format,
             rate: params.rate as u16,
             channels: params.channels as u8,
-            layout: params.layout
+            layout: params.layout,
+            prefs: params.prefs
         }
     }
 }
 
 impl<'a> From<&'a StreamParams> for ffi::cubeb_stream_params {
     fn from(params: &StreamParams) -> Self {
         ffi::cubeb_stream_params {
             format: params.format,
             rate: u32::from(params.rate),
             channels: u32::from(params.channels),
-            layout: params.layout
+            layout: params.layout,
+            prefs: params.prefs
         }
     }
 }
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct StreamInitParams {
     pub stream_name: Option<Vec<u8>>,
     pub input_device: usize,
diff --git a/media/audioipc/gecko.patch b/media/audioipc/gecko.patch
--- a/media/audioipc/gecko.patch
+++ b/media/audioipc/gecko.patch
@@ -44,17 +44,17 @@ diff --git a/server/Cargo.toml b/server/
 index 5b79b83..01463be 100644
 --- a/media/audioipc/server/Cargo.toml
 +++ b/media/audioipc/server/Cargo.toml
 @@ -9,8 +9,8 @@ description = "Remote cubeb server"
  
  [dependencies]
  audioipc = { path = "../audioipc" }
 -cubeb-core = { git = "https://github.com/djg/cubeb-rs", version="^0.1" }
--cubeb = { git = "https://github.com/djg/cubeb-rs", version="^0.3.1" }
+-cubeb = { git = "https://github.com/djg/cubeb-rs", version="^0.3.2" }
 +cubeb-core = { path = "../../cubeb-rs/cubeb-core" }
 +cubeb = { path = "../../cubeb-rs/cubeb-api" }
  bytes = "0.4"
  lazycell = "^0.4"
  libc = "0.2"
 -- 
 2.10.2
 
diff --git a/media/audioipc/server/Cargo.toml b/media/audioipc/server/Cargo.toml
--- a/media/audioipc/server/Cargo.toml
+++ b/media/audioipc/server/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "audioipc-server"
-version = "0.2.0"
+version = "0.2.1"
 authors = [
         "Matthew Gregan <kinetik@flim.org>",
         "Dan Glastonbury <dan.glastonbury@gmail.com>"
         ]
 description = "Remote cubeb server"
 
 [dependencies]
 audioipc = { path = "../audioipc" }