From e53131737fcbec1798b83368f17146084f6d4b25 Mon Sep 17 00:00:00 2001 From: thajohns Date: Thu, 9 Sep 2021 04:18:41 -0400 Subject: fixed sample rate --- src/main.rs | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/main.rs b/src/main.rs index 865f6f8..ec71be1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -28,7 +28,16 @@ fn main() -> Result<(), std::io::Error> { } fn main_client(args: Vec) -> Result<(), std::io::Error> { - let env = Environment::default(); + let host = cpal::default_host(); + let device = host.default_output_device().expect("no default host audio device!"); + let mut conf_range = device.supported_output_configs().expect("could not query audio device capabilities -- audio device disconnected?"); + let conf = conf_range.next().expect("audio device has no supported configs!").with_max_sample_rate().config(); + + println!("playing at sample rate {}", conf.sample_rate.0); + let env = Environment { + sample_rate: conf.sample_rate.0 as f32, + default_buffer_size: 64, + }; let mut genfile = File::open( args.iter() @@ -64,10 +73,6 @@ fn main_client(args: Vec) -> Result<(), std::io::Error> { .expect("Failed to init shared buffer") .append(&mut iter::repeat(0.0f32).take(last_buffer_lim).collect()); - let host = cpal::default_host(); - let device = host.default_output_device().expect("no default host audio device!"); - let mut conf_range = device.supported_output_configs().expect("could not query audio device capabilities -- audio device disconnected?"); - let conf = conf_range.next().expect("audio device has no supported configs!").with_max_sample_rate().config(); let stream; { let client = client.clone(); @@ -94,9 +99,15 @@ fn main_client(args: Vec) -> Result<(), std::io::Error> { ring.append(&mut cli.buffer().iter().map(|&x| x).collect()); } let mut drain = ring.drain(..frames); + let mut min = 1.0; + let mut max = 0.0; for i in 0..frames { - data[i] = drain.next().unwrap(); + let frame = drain.next().unwrap(); + min = f32::min(min, frame); + max = f32::max(min, frame); + data[i] = frame; } + println!("played {} frames, min {}, max {}", frames, min, max); }, move |err| { println!("audio stream error: {}", err); -- cgit v1.2.3-70-g09d2