Refactor asio-sys to use less global state and more RAII

The asio-sys examples have been tested and still work nicely. The CPAL
asio host has not yet been updated for these changes.
This commit is contained in:
mitchmindtree 2019-06-28 03:00:52 +10:00
parent 05f8b7dc43
commit efe683133c
4 changed files with 486 additions and 706 deletions

View file

@ -34,19 +34,20 @@ pub struct Format {
}
fn main() {
for name in sys::get_driver_list() {
let asio = sys::Asio::new();
for name in asio.driver_names() {
println!("Driver: {:?}", name);
let driver = sys::Drivers::load(&name).expect("failed to load driver");
let channels = driver.get_channels();
let sample_rate = driver.get_sample_rate();
let driver = asio.load_driver(&name).expect("failed to load driver");
let channels = driver.channels().expect("failed to retrieve channel counts");
let sample_rate = driver.sample_rate().expect("failed to retrieve sample rate");
let in_fmt = Format {
channels: channels.ins as _,
sample_rate: SampleRate(sample_rate.rate as _),
sample_rate: SampleRate(sample_rate as _),
data_type: SampleFormat::F32,
};
let out_fmt = Format {
channels: channels.outs as _,
sample_rate: SampleRate(sample_rate.rate as _),
sample_rate: SampleRate(sample_rate as _),
data_type: SampleFormat::F32,
};
println!(" Input {:?}", in_fmt);

View file

@ -1,13 +1,11 @@
extern crate asio_sys as sys;
fn main() {
let driver_list = sys::get_driver_list();
for driver in &driver_list {
let asio = sys::Asio::new();
for driver in asio.driver_names() {
println!("Driver: {}", driver);
let driver = sys::Drivers::load(driver).expect("failed to load drivers");
println!(" Channels: {:?}", driver.get_channels());
println!(" Sample rate: {:?}", driver.get_sample_rate());
let driver = asio.load_driver(&driver).expect("failed to load drivers");
println!(" Channels: {:?}", driver.channels().expect("failed to get channels"));
println!(" Sample rate: {:?}", driver.sample_rate().expect("failed to get sample rate"));
}
}