Merge remote-tracking branch 'upstream/master' into aaron/openbsd_sndio_host

Author: AaronM04

.github/workflows/cpal.yml

@@ -3,6 +3,7 @@ name: cpal
 on: [push, pull_request]
 
 jobs:
+
   clippy-test:
     runs-on: ubuntu-latest
     steps:
@@ -98,6 +99,51 @@ jobs:
         command: test
         args: --all --all-features --verbose
 
+  linux-check-and-test-armv7:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v2
+
+      - name: Install stable toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          target: armv7-unknown-linux-gnueabihf
+          override: true
+
+      - name: Build image
+        run: docker build -t cross/cpal_armv7:v1 ./
+
+      - name: Check without features for armv7
+        uses: actions-rs/cargo@v1
+        with:
+          command: check
+          use-cross: true
+          args: --target armv7-unknown-linux-gnueabihf --workspace --no-default-features --verbose
+
+      - name: Test without features for armv7
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          use-cross: true
+          args: --target armv7-unknown-linux-gnueabihf --workspace --no-default-features --verbose
+
+      - name: Check all features for armv7
+        uses: actions-rs/cargo@v1
+        with:
+          command: check
+          use-cross: true
+          args: --target armv7-unknown-linux-gnueabihf --workspace --all-features --verbose
+
+      - name: Test all features for armv7
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          use-cross: true
+          args: --target armv7-unknown-linux-gnueabihf --workspace --all-features --verbose
+
   asmjs-wasm32-test:
     strategy:
       matrix:
@@ -216,6 +262,8 @@ jobs:
         toolchain: stable
         override: true
         target: armv7-linux-androideabi
+    - name: Check android
+      run: cargo check --example android --target armv7-linux-androideabi --verbose
     - name: Check beep
       run: cargo check --example beep --target armv7-linux-androideabi --verbose
     - name: Check enumerate
@@ -224,3 +272,38 @@ jobs:
       run: cargo check --example feedback --target armv7-linux-androideabi --verbose
     - name: Check record_wav
       run: cargo check --example record_wav --target armv7-linux-androideabi --verbose
+
+  android-apk-build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install Android targets
+      run: |
+        rustup target add armv7-linux-androideabi
+        rustup target add aarch64-linux-android
+        rustup target add i686-linux-android
+        rustup target add x86_64-linux-android
+    - name: Install Cargo APK
+      run: cargo install cargo-apk
+    - name: Build APK
+      run: cargo apk build --example android
+
+  ios-build:
+    runs-on: macOS-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install llvm and clang
+      run: brew install llvm
+    - name: Install stable
+      uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: stable
+        override: true
+    - name: Add iOS targets
+      run: rustup target add aarch64-apple-ios x86_64-apple-ios
+    - name: Install cargo lipo
+      run: cargo install cargo-lipo
+    - name: Build iphonesimulator feedback example
+      run: cd examples/ios-feedback && xcodebuild -scheme cpal-ios-example -configuration Debug -derivedDataPath build -sdk iphonesimulator
+

CHANGELOG.md

@@ -1,3 +1,13 @@
+# Version 0.13.1 (2020-11-08)
+
+- Don't panic when device is plugged out on Windows
+- Update `parking_lot` dependency
+
+# Version 0.13.0 (2020-10-28)
+
+- Add Android support via `oboe-rs`.
+- Add Android APK build an CI job.
+
 # Version 0.12.1 (2020-07-23)
 
 - Bugfix release to get the asio feature working again.

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cpal"
-version = "0.12.1"
+version = "0.13.1"
 authors = ["The CPAL contributors", "Pierre Krieger <[email protected]>"]
 description = "Low-level cross-platform audio I/O library in pure Rust."
 repository = "https://github.com/rustaudio/cpal"
@@ -11,37 +11,43 @@ keywords = ["audio", "sound"]
 [features]
 asio = ["asio-sys", "num-traits"] # Only available on Windows. See README for setup instructions.
 
-
 [dependencies]
 thiserror = "1.0.2"
 
 [dev-dependencies]
 anyhow = "1.0.12"
 hound = "3.4"
-ringbuf = "0.1.6"
+ringbuf = "0.2"
+clap = { version = "2.33.3", default-features = false }
 
 [target.'cfg(target_os = "windows")'.dependencies]
 winapi = { version = "0.3", features = ["audiosessiontypes", "audioclient", "coml2api", "combaseapi", "debug", "devpkey", "handleapi", "ksmedia", "mmdeviceapi", "objbase", "profileapi", "std", "synchapi", "winbase", "winuser"] }
 asio-sys = { version = "0.2", path = "asio-sys", optional = true }
 num-traits = { version = "0.2.6", optional = true }
-parking_lot = "0.9"
+parking_lot = "0.11"
 lazy_static = "1.3"
 
 [target.'cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"))'.dependencies]
-alsa = "0.4.1"
+alsa = "0.4.3"
 nix = "0.15.0"
 libc = "0.2.65"
+parking_lot = "0.11"
 jack = { version = "0.6.5", optional = true }
 
 [target.'cfg(target_os = "openbsd")'.dependencies]
 sndio-sys = "0.0.*"
 libc = "0.2.65"
 
 [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies]
-coreaudio-rs = { version = "0.9.1", default-features = false, features = ["audio_unit", "core_audio"] }
 core-foundation-sys = "0.6.2" # For linking to CoreFoundation.framework and handling device name `CFString`s.
 mach = "0.3" # For access to mach_timebase type.
 
+[target.'cfg(target_os = "macos")'.dependencies]
+coreaudio-rs = { version = "0.10.0", default-features = false, features = ["audio_unit", "core_audio"] }
+
+[target.'cfg(target_os = "ios")'.dependencies]
+coreaudio-rs = { version = "0.10.0", default-features = false, features = ["audio_unit", "core_audio", "audio_toolbox"] }
+
 [target.'cfg(target_os = "emscripten")'.dependencies]
 stdweb = { version = "0.1.3", default-features = false }
 
@@ -51,7 +57,24 @@ js-sys = { version = "0.3.35" }
 web-sys = { version = "0.3.35", features = [ "AudioContext", "AudioContextOptions", "AudioBuffer", "AudioBufferSourceNode", "AudioNode",  "AudioDestinationNode", "Window", "AudioContextState"] }
 
 [target.'cfg(target_os = "android")'.dependencies]
-oboe = { version = "0.2.1", features = [ "java-interface" ] }
+oboe = { version = "0.3.0", features = [ "java-interface" ] }
 ndk = "0.2"
 ndk-glue = "0.2"
 jni = "0.17"
+
+[[example]]
+name = "android"
+path = "examples/android.rs"
+crate-type = ["cdylib"]
+
+[[example]]
+name = "beep"
+
+[[example]]
+name = "enumerate"
+
+[[example]]
+name = "feedback"
+
+[[example]]
+name = "record_wav"

Cross.toml

@@ -0,0 +1,7 @@
+[target.armv7-unknown-linux-gnueabihf]
+image = "cross/cpal_armv7:v1"
+
+[target.armv7-unknown-linux-gnueabihf.env]
+passthrough = [
+    "RUSTFLAGS",
+]

Dockerfile

@@ -0,0 +1,9 @@
+FROM rustembedded/cross:armv7-unknown-linux-gnueabihf
+
+ENV PKG_CONFIG_ALLOW_CROSS 1
+ENV PKG_CONFIG_PATH /usr/lib/arm-linux-gnueabihf/pkgconfig/
+
+RUN dpkg --add-architecture armhf && \
+    apt-get update && \
+    apt-get install libasound2-dev:armhf -y && \
+    apt-get install libjack-jackd2-dev:armhf libjack-jackd2-0:armhf -y \

examples/android.rs

@@ -0,0 +1,65 @@
+#![allow(dead_code)]
+
+extern crate anyhow;
+extern crate cpal;
+
+use cpal::traits::{DeviceTrait, HostTrait, StreamTrait};
+
+#[cfg_attr(target_os = "android", ndk_glue::main(backtrace = "full"))]
+fn main() {
+    let host = cpal::default_host();
+
+    let device = host
+        .default_output_device()
+        .expect("failed to find output device");
+
+    let config = device.default_output_config().unwrap();
+
+    match config.sample_format() {
+        cpal::SampleFormat::F32 => run::<f32>(&device, &config.into()).unwrap(),
+        cpal::SampleFormat::I16 => run::<i16>(&device, &config.into()).unwrap(),
+        cpal::SampleFormat::U16 => run::<u16>(&device, &config.into()).unwrap(),
+    }
+}
+
+fn run<T>(device: &cpal::Device, config: &cpal::StreamConfig) -> Result<(), anyhow::Error>
+where
+    T: cpal::Sample,
+{
+    let sample_rate = config.sample_rate.0 as f32;
+    let channels = config.channels as usize;
+
+    // Produce a sinusoid of maximum amplitude.
+    let mut sample_clock = 0f32;
+    let mut next_value = move || {
+        sample_clock = (sample_clock + 1.0) % sample_rate;
+        (sample_clock * 440.0 * 2.0 * std::f32::consts::PI / sample_rate).sin()
+    };
+
+    let err_fn = |err| eprintln!("an error occurred on stream: {}", err);
+
+    let stream = device.build_output_stream(
+        config,
+        move |data: &mut [T], _: &cpal::OutputCallbackInfo| {
+            write_data(data, channels, &mut next_value)
+        },
+        err_fn,
+    )?;
+    stream.play()?;
+
+    std::thread::sleep(std::time::Duration::from_millis(1000));
+
+    Ok(())
+}
+
+fn write_data<T>(output: &mut [T], channels: usize, next_sample: &mut dyn FnMut() -> f32)
+where
+    T: cpal::Sample,
+{
+    for frame in output.chunks_mut(channels) {
+        let value: T = cpal::Sample::from::<f32>(&next_sample());
+        for sample in frame.iter_mut() {
+            *sample = value;
+        }
+    }
+}