Bug 1380233 - Update cubeb pulse rust backend from upstream to 3b8cfba. r?djg
MozReview-Commit-ID: CKfpyKaqLSe
--- a/media/libcubeb/cubeb-pulse-rs/README_MOZILLA
+++ b/media/libcubeb/cubeb-pulse-rs/README_MOZILLA
@@ -1,8 +1,8 @@
The source from this directory was copied from the cubeb-pulse-rs
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 cubeb-pulse-rs git repository is: https://github.com/djg/cubeb-pulse-rs.git
-The git commit ID used was 64515819cdf54a16626df5dce5f5c7cb1220d53b (2017-06-19 17:41:30 +1000)
+The git commit ID used was 3b8cfba161cec66bee6a755bce102466baa92ddb (2017-07-07 14:57:07 +1000)
--- a/media/libcubeb/cubeb-pulse-rs/cubeb-ffi/src/ffi.rs
+++ b/media/libcubeb/cubeb-pulse-rs/cubeb-ffi/src/ffi.rs
@@ -222,16 +222,17 @@ pub struct Ops {
-> i32>,
pub device_collection_destroy:
Option<unsafe extern "C" fn(context: *mut Context, collection: *mut DeviceCollection) -> i32>,
pub destroy: Option<unsafe extern "C" fn(context: *mut Context)>,
pub stream_init: StreamInitFn,
pub stream_destroy: Option<unsafe extern "C" fn(stream: *mut Stream)>,
pub stream_start: Option<unsafe extern "C" fn(stream: *mut Stream) -> i32>,
pub stream_stop: Option<unsafe extern "C" fn(stream: *mut Stream) -> i32>,
+ pub stream_reset_default_device: Option<unsafe extern "C" fn(stream: *mut Stream) -> i32>,
pub stream_get_position: Option<unsafe extern "C" fn(stream: *mut Stream, position: *mut u64) -> i32>,
pub stream_get_latency: Option<unsafe extern "C" fn(stream: *mut Stream, latency: *mut u32) -> i32>,
pub stream_set_volume: Option<unsafe extern "C" fn(stream: *mut Stream, volumes: f32) -> i32>,
pub stream_set_panning: Option<unsafe extern "C" fn(stream: *mut Stream, panning: f32) -> i32>,
pub stream_get_current_device: Option<unsafe extern "C" fn(stream: *mut Stream, device: *mut *const Device) -> i32>,
pub stream_device_destroy: Option<unsafe extern "C" fn(stream: *mut Stream, device: *mut Device) -> i32>,
pub stream_register_device_changed_callback:
Option<unsafe extern "C" fn(stream: *mut Stream,
--- a/media/libcubeb/cubeb-pulse-rs/src/capi.rs
+++ b/media/libcubeb/cubeb-pulse-rs/src/capi.rs
@@ -227,16 +227,17 @@ pub const PULSE_OPS: cubeb::Ops = cubeb:
get_preferred_channel_layout: Some(capi_get_preferred_channel_layout),
enumerate_devices: Some(capi_enumerate_devices),
device_collection_destroy: Some(capi_device_collection_destroy),
destroy: Some(capi_destroy),
stream_init: Some(capi_stream_init),
stream_destroy: Some(capi_stream_destroy),
stream_start: Some(capi_stream_start),
stream_stop: Some(capi_stream_stop),
+ stream_reset_default_device: None,
stream_get_position: Some(capi_stream_get_position),
stream_get_latency: Some(capi_stream_get_latency),
stream_set_volume: Some(capi_stream_set_volume),
stream_set_panning: Some(capi_stream_set_panning),
stream_get_current_device: Some(capi_stream_get_current_device),
stream_device_destroy: Some(capi_stream_device_destroy),
stream_register_device_changed_callback: None,
register_device_collection_changed: Some(capi_register_device_collection_changed),