Skip to content

Commit

Permalink
Bug 1360053 - Fetch version dbcd7f of cubeb-pulse-rs from github. r=k…
Browse files Browse the repository at this point in the history
…inetik

MozReview-Commit-ID: 8vy5Sy1430s

--HG--
extra : rebase_source : 72b3370258affb14dfa2754b1816eea13a4d1e2e
  • Loading branch information
Dan Glastonbury committed Apr 27, 2017
1 parent 498b61d commit 4f5a795
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 606 deletions.
2 changes: 1 addition & 1 deletion media/libcubeb/cubeb-pulse-rs/README_MOZILLA
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ 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 faa1dcf3a061144c1f7edee76f23691eabd1f436 (2017-04-20 11:23:09 +1000)
The git commit ID used was dbcd7f96aea8d249a4b78f9a7597768c9dff22eb (2017-04-25 11:42:10 +1000)
6 changes: 0 additions & 6 deletions media/libcubeb/cubeb-pulse-rs/cubeb-ffi/src/errors.rs

This file was deleted.

14 changes: 1 addition & 13 deletions media/libcubeb/cubeb-pulse-rs/cubeb-ffi/src/ffi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ fn bindgen_test_layout_cubeb_device_info() {
#[test]
fn bindgen_test_layout_cubeb_device_collection() {
assert_eq!(::std::mem::size_of::<DeviceCollection>(),
16usize,
8usize,
concat!("Size of: ", stringify!(DeviceCollection)));
assert_eq!(::std::mem::align_of::<DeviceCollection>(),
8usize,
Expand All @@ -506,15 +506,3 @@ fn bindgen_test_layout_cubeb_device_collection() {
stringify!(device)));

}

#[test]
fn test_normal_logging() {
log!("This is log at normal level");
log!("This is {} at normal level", "log with param");
}

#[test]
fn test_verbose_logging() {
logv!("This is a log at verbose level");
logv!("This is {} at verbose level", "log with param");
}
34 changes: 0 additions & 34 deletions media/libcubeb/cubeb-pulse-rs/cubeb-ffi/src/internal.rs

This file was deleted.

9 changes: 9 additions & 0 deletions media/libcubeb/cubeb-pulse-rs/cubeb-ffi/src/log.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ extern "C" {
pub static g_cubeb_log_callback: LogCallback;
}

pub fn log_enabled() -> bool {
unsafe { g_cubeb_log_level != LogLevel::Disabled }
}

#[test]
fn test_normal_logging() {
log!("This is log at normal level");
Expand All @@ -64,3 +68,8 @@ fn test_verbose_logging() {
logv!("This is a log at verbose level");
logv!("Formatted log %d", 1);
}

#[test]
fn test_logging_disabled_by_default() {
assert!(!log_enabled());
}
89 changes: 0 additions & 89 deletions media/libcubeb/cubeb-pulse-rs/cubeb-ffi/src/types/device_fmt.rs

This file was deleted.

68 changes: 0 additions & 68 deletions media/libcubeb/cubeb-pulse-rs/cubeb-ffi/src/types/device_pref.rs

This file was deleted.

70 changes: 0 additions & 70 deletions media/libcubeb/cubeb-pulse-rs/cubeb-ffi/src/types/device_type.rs

This file was deleted.

Loading

0 comments on commit 4f5a795

Please sign in to comment.