Bump cubeb-rs to 0.12 and handle ABI changes

audioipc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "audioipc2"
-version = "0.5.0"
+version = "0.6.0"
 authors = [
         "Matthew Gregan <[email protected]>",
         "Dan Glastonbury <[email protected]>",
@@ -13,7 +13,7 @@ edition = "2018"
 bincode = "1.3"
 byteorder = "1"
 bytes = "1"
-cubeb = "0.10"
+cubeb = "0.12"
 log = "0.4"
 serde = "1"
 serde_derive = "1"

audioipc/src/messages.rs

@@ -209,6 +209,7 @@ pub enum ServerMessage {
     ContextGetMaxChannelCount,
     ContextGetMinLatency(StreamParams),
     ContextGetPreferredSampleRate,
+    ContextGetSupportedInputProcessingParams,
     ContextGetDeviceEnumeration(ffi::cubeb_device_type),
     ContextSetupDeviceCollectionCallback,
     ContextRegisterDeviceCollectionChanged(ffi::cubeb_device_type, bool),
@@ -225,6 +226,8 @@ pub enum ServerMessage {
     StreamSetVolume(usize, f32),
     StreamSetName(usize, CString),
     StreamGetCurrentDevice(usize),
+    StreamSetInputMute(usize, bool),
+    StreamSetInputProcessingParams(usize, ffi::cubeb_input_processing_params),
     StreamRegisterDeviceChangeCallback(usize, bool),
 
     #[cfg(target_os = "linux")]
@@ -242,6 +245,7 @@ pub enum ClientMessage {
     ContextMaxChannelCount(u32),
     ContextMinLatency(u32),
     ContextPreferredSampleRate(u32),
+    ContextSupportedInputProcessingParams(ffi::cubeb_input_processing_params),
     ContextEnumeratedDevices(Vec<DeviceInfo>),
     ContextSetupDeviceCollectionCallback(RegisterDeviceCollectionChanged),
     ContextRegisteredDeviceCollectionChanged,
@@ -258,6 +262,8 @@ pub enum ClientMessage {
     StreamVolumeSet,
     StreamNameSet,
     StreamCurrentDevice(Device),
+    StreamInputMuteSet,
+    StreamInputProcessingParamsSet,
     StreamRegisterDeviceChangeCallback,
 
     #[cfg(target_os = "linux")]

client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "audioipc2-client"
-version = "0.5.0"
+version = "0.6.0"
 authors = [
         "Matthew Gregan <[email protected]>",
         "Dan Glastonbury <[email protected]>",
@@ -11,6 +11,6 @@ edition = "2018"
 
 [dependencies]
 audioipc = { package = "audioipc2", path = "../audioipc" }
-cubeb-backend = "0.10"
+cubeb-backend = "0.12"
 log = "0.4"
 audio_thread_priority = { version = "0.30", default-features = false }

client/src/context.rs

@@ -17,8 +17,8 @@ use audioipc::{
     ServerMessage,
 };
 use cubeb_backend::{
-    capi_new, ffi, Context, ContextOps, DeviceCollectionRef, DeviceId, DeviceType, Error, Ops,
-    Result, Stream, StreamParams, StreamParamsRef,
+    capi_new, ffi, Context, ContextOps, DeviceCollectionRef, DeviceId, DeviceType, Error,
+    InputProcessingParams, Ops, Result, Stream, StreamParams, StreamParamsRef,
 };
 use std::ffi::{CStr, CString};
 use std::os::raw::c_void;
@@ -239,6 +239,14 @@ impl ContextOps for ClientContext {
         send_recv!(self.rpc(), ContextGetPreferredSampleRate => ContextPreferredSampleRate())
     }
 
+    fn supported_input_processing_params(&mut self) -> Result<InputProcessingParams> {
+        assert_not_in_callback();
+        send_recv!(self.rpc(),
+                   ContextGetSupportedInputProcessingParams =>
+                   ContextSupportedInputProcessingParams())
+        .map(InputProcessingParams::from_bits_truncate)
+    }
+
     fn enumerate_devices(
         &mut self,
         devtype: DeviceType,

client/src/stream.rs

@@ -9,7 +9,7 @@ use audioipc::messages::StreamCreateParams;
 use audioipc::messages::{self, CallbackReq, CallbackResp, ClientMessage, ServerMessage};
 use audioipc::shm::SharedMem;
 use audioipc::{rpccore, sys};
-use cubeb_backend::{ffi, DeviceRef, Error, Result, Stream, StreamOps};
+use cubeb_backend::{ffi, DeviceRef, Error, InputProcessingParams, Result, Stream, StreamOps};
 use std::ffi::{CStr, CString};
 use std::os::raw::c_void;
 use std::ptr;
@@ -302,6 +302,18 @@ impl StreamOps for ClientStream<'_> {
         }
     }
 
+    fn set_input_mute(&mut self, mute: bool) -> Result<()> {
+        assert_not_in_callback();
+        let rpc = self.context.rpc();
+        send_recv!(rpc, StreamSetInputMute(self.token, mute) => StreamInputMuteSet)
+    }
+
+    fn set_input_processing_params(&mut self, params: InputProcessingParams) -> Result<()> {
+        assert_not_in_callback();
+        let rpc = self.context.rpc();
+        send_recv!(rpc, StreamSetInputProcessingParams(self.token, params.bits()) => StreamInputProcessingParamsSet)
+    }
+
     fn device_destroy(&mut self, device: &DeviceRef) -> Result<()> {
         assert_not_in_callback();
         if device.as_ptr().is_null() {

ipctest/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ipctest"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["Dan Glastonbury <[email protected]>"]
 license = "ISC"
 edition = "2018"
@@ -9,7 +9,7 @@ edition = "2018"
 audioipc = { package = "audioipc2", path = "../audioipc" }
 audioipc-client = { package = "audioipc2-client", path = "../client" }
 audioipc-server = { package = "audioipc2-server", path = "../server" }
-cubeb = "0.10.0"
+cubeb = "0.12.0"
 env_logger = "0.9"
 error-chain = "0.12.0"
 log = "0.4"

server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "audioipc2-server"
-version = "0.5.0"
+version = "0.6.0"
 authors = [
         "Matthew Gregan <[email protected]>",
         "Dan Glastonbury <[email protected]>",
@@ -11,7 +11,7 @@ edition = "2018"
 
 [dependencies]
 audioipc = { package = "audioipc2", path = "../audioipc" }
-cubeb-core = "0.10.0"
+cubeb-core = "0.12.0"
 once_cell = "1.2.0"
 log = "0.4"
 slab = "0.4"

server/src/server.rs

@@ -13,6 +13,7 @@ use audioipc::messages::{
 };
 use audioipc::shm::SharedMem;
 use audioipc::{ipccore, rpccore, sys, PlatformHandle};
+use cubeb::InputProcessingParams;
 use cubeb_core as cubeb;
 use cubeb_core::ffi;
 use std::convert::{From, TryInto};
@@ -509,6 +510,11 @@ impl CubebServer {
                 .map(ClientMessage::ContextPreferredSampleRate)
                 .unwrap_or_else(error),
 
+            ServerMessage::ContextGetSupportedInputProcessingParams => context
+                .supported_input_processing_params()
+                .map(|params| ClientMessage::ContextSupportedInputProcessingParams(params.bits()))
+                .unwrap_or_else(error),
+
             ServerMessage::ContextGetDeviceEnumeration(device_type) => context
                 .enumerate_devices(cubeb::DeviceType::from_bits_truncate(device_type))
                 .map(|devices| {
@@ -585,6 +591,18 @@ impl CubebServer {
                 .map(|device| ClientMessage::StreamCurrentDevice(Device::from(device)))
                 .unwrap_or_else(error),
 
+            ServerMessage::StreamSetInputMute(stm_tok, mute) => try_stream!(self, stm_tok)
+                .set_input_mute(mute)
+                .map(|_| ClientMessage::StreamInputMuteSet)
+                .unwrap_or_else(error),
+
+            ServerMessage::StreamSetInputProcessingParams(stm_tok, params) => {
+                try_stream!(self, stm_tok)
+                    .set_input_processing_params(InputProcessingParams::from_bits_truncate(params))
+                    .map(|_| ClientMessage::StreamInputProcessingParamsSet)
+                    .unwrap_or_else(error)
+            }
+
             ServerMessage::StreamRegisterDeviceChangeCallback(stm_tok, enable) => {
                 try_stream!(self, stm_tok)
                     .register_device_changed_callback(if enable {