diff --git a/Cargo.toml b/Cargo.toml index c35bfb4..8972176 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ num-traits = { version = "0.2.6", optional = true } parking_lot = "0.12" once_cell = "1.12" -[target.'cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"))'.dependencies] +[target.'cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd"))'.dependencies] alsa = "0.6" nix = "0.23" libc = "0.2.65" diff --git a/examples/beep.rs b/examples/beep.rs index 264bcee..6ede2ea 100644 --- a/examples/beep.rs +++ b/examples/beep.rs @@ -8,7 +8,7 @@ use cpal::traits::{DeviceTrait, HostTrait, StreamTrait}; #[derive(Debug)] struct Opt { #[cfg(all( - any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"), + any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd"), feature = "jack" ))] jack: bool, @@ -20,7 +20,7 @@ impl Opt { fn from_args() -> Self { let app = clap::Command::new("beep").arg(arg!([DEVICE] "The audio device to use")); #[cfg(all( - any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"), + any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd"), feature = "jack" ))] let app = app.arg(arg!(-j --jack "Use the JACK host")); @@ -28,7 +28,7 @@ impl Opt { let device = matches.value_of("DEVICE").unwrap_or("default").to_string(); #[cfg(all( - any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"), + any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd"), feature = "jack" ))] return Opt { @@ -37,7 +37,7 @@ impl Opt { }; #[cfg(any( - not(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd")), + not(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd")), not(feature = "jack") ))] Opt { device } @@ -49,7 +49,7 @@ fn main() -> anyhow::Result<()> { // Conditionally compile with jack if the feature is specified. #[cfg(all( - any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"), + any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd"), feature = "jack" ))] // Manually check for flags. Can be passed through cargo with -- e.g. @@ -66,7 +66,7 @@ fn main() -> anyhow::Result<()> { }; #[cfg(any( - not(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd")), + not(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd")), not(feature = "jack") ))] let host = cpal::default_host(); diff --git a/examples/feedback.rs b/examples/feedback.rs index 323c183..70d11a6 100644 --- a/examples/feedback.rs +++ b/examples/feedback.rs @@ -19,7 +19,7 @@ use ringbuf::RingBuffer; #[derive(Debug)] struct Opt { #[cfg(all( - any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"), + any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd"), feature = "jack" ))] jack: bool, @@ -38,7 +38,7 @@ impl Opt { .arg(arg!([OUT] "The output audio device to use")); #[cfg(all( - any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"), + any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd"), feature = "jack" ))] let app = app.arg(arg!(-j --jack "Use the JACK host")); @@ -52,7 +52,7 @@ impl Opt { let output_device = matches.value_of("OUT").unwrap_or("default").to_string(); #[cfg(all( - any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"), + any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd"), feature = "jack" ))] return Ok(Opt { @@ -63,7 +63,7 @@ impl Opt { }); #[cfg(any( - not(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd")), + not(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd")), not(feature = "jack") ))] Ok(Opt { @@ -79,7 +79,7 @@ fn main() -> anyhow::Result<()> { // Conditionally compile with jack if the feature is specified. #[cfg(all( - any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"), + any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd"), feature = "jack" ))] // Manually check for flags. Can be passed through cargo with -- e.g. @@ -96,7 +96,7 @@ fn main() -> anyhow::Result<()> { }; #[cfg(any( - not(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd")), + not(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd")), not(feature = "jack") ))] let host = cpal::default_host(); diff --git a/examples/record_wav.rs b/examples/record_wav.rs index a7f4de3..a3d52a7 100644 --- a/examples/record_wav.rs +++ b/examples/record_wav.rs @@ -16,7 +16,7 @@ use std::sync::{Arc, Mutex}; #[derive(Debug)] struct Opt { #[cfg(all( - any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"), + any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd"), feature = "jack" ))] jack: bool, @@ -28,7 +28,7 @@ impl Opt { fn from_args() -> Self { let app = clap::Command::new("record_wav").arg(arg!([DEVICE] "The audio device to use")); #[cfg(all( - any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"), + any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd"), feature = "jack" ))] let app = app.arg(arg!(-j --jack "Use the JACK host")); @@ -36,7 +36,7 @@ impl Opt { let device = matches.value_of("DEVICE").unwrap_or("default").to_string(); #[cfg(all( - any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"), + any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd"), feature = "jack" ))] return Opt { @@ -45,7 +45,7 @@ impl Opt { }; #[cfg(any( - not(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd")), + not(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd")), not(feature = "jack") ))] Opt { device } @@ -57,7 +57,7 @@ fn main() -> Result<(), anyhow::Error> { // Conditionally compile with jack if the feature is specified. #[cfg(all( - any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"), + any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd"), feature = "jack" ))] // Manually check for flags. Can be passed through cargo with -- e.g. @@ -74,7 +74,7 @@ fn main() -> Result<(), anyhow::Error> { }; #[cfg(any( - not(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd")), + not(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd")), not(feature = "jack") ))] let host = cpal::default_host(); diff --git a/src/host/alsa/mod.rs b/src/host/alsa/mod.rs index fa6f921..c7a88d1 100644 --- a/src/host/alsa/mod.rs +++ b/src/host/alsa/mod.rs @@ -25,7 +25,7 @@ pub type SupportedOutputConfigs = VecIntoIter; mod enumerate; -/// The default linux, dragonfly and freebsd host type. +/// The default linux, dragonfly, freebsd and netbsd host type. #[derive(Debug)] pub struct Host; @@ -40,7 +40,7 @@ impl HostTrait for Host { type Device = Device; fn is_available() -> bool { - // Assume ALSA is always available on linux/dragonfly/freebsd. + // Assume ALSA is always available on linux/dragonfly/freebsd/netbsd. true } diff --git a/src/host/mod.rs b/src/host/mod.rs index 555b010..109a737 100644 --- a/src/host/mod.rs +++ b/src/host/mod.rs @@ -1,4 +1,4 @@ -#[cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"))] +#[cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd"))] pub(crate) mod alsa; #[cfg(all(windows, feature = "asio"))] pub(crate) mod asio; @@ -7,7 +7,7 @@ pub(crate) mod coreaudio; #[cfg(target_os = "emscripten")] pub(crate) mod emscripten; #[cfg(all( - any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"), + any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd"), feature = "jack" ))] pub(crate) mod jack; diff --git a/src/platform/mod.rs b/src/platform/mod.rs index 23462e1..c90ce34 100644 --- a/src/platform/mod.rs +++ b/src/platform/mod.rs @@ -562,7 +562,7 @@ macro_rules! impl_platform_host { } // TODO: Add pulseaudio and jack here eventually. -#[cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"))] +#[cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd"))] mod platform_impl { pub use crate::host::alsa::{ Device as AlsaDevice, Devices as AlsaDevices, Host as AlsaHost, Stream as AlsaStream, @@ -687,6 +687,7 @@ mod platform_impl { target_os = "linux", target_os = "dragonfly", target_os = "freebsd", + target_os = "netbsd", target_os = "macos", target_os = "ios", target_os = "emscripten",