diff --git a/src/audio/resampling.rs b/src/audio/resampling.rs index f7312c3..6dc61f2 100644 --- a/src/audio/resampling.rs +++ b/src/audio/resampling.rs @@ -1,5 +1,4 @@ use num::Complex; -use rubato::{FastFixedIn, PolynomialDegree, Resampler}; use rustfft::FftPlanner; #[inline] diff --git a/src/commands/run.rs b/src/commands/run.rs index ec79c6e..f32ad83 100644 --- a/src/commands/run.rs +++ b/src/commands/run.rs @@ -153,7 +153,6 @@ pub fn run(run: Run) { .unwrap(); let config = device.default_input_config().unwrap(); let channels = config.channels(); - let sample_rate = config.sample_rate().0; let virtual_devices = virtual_devices .iter() @@ -167,12 +166,7 @@ pub fn run(run: Run) { &config.into(), { move |data: &[i8], _| { - input_callback( - data, - channels.into(), - sample_rate, - virtual_devices.clone(), - ) + input_callback(data, channels.into(), virtual_devices.clone()) } }, move |err| eprintln!("An error occurred on the input stream: {}", err), @@ -182,12 +176,7 @@ pub fn run(run: Run) { &config.into(), { move |data: &[i16], _| { - input_callback( - data, - channels.into(), - sample_rate, - virtual_devices.clone(), - ) + input_callback(data, channels.into(), virtual_devices.clone()) } }, move |err| eprintln!("An error occurred on the input stream: {}", err), @@ -197,12 +186,7 @@ pub fn run(run: Run) { &config.into(), { move |data: &[i32], _| { - input_callback( - data, - channels.into(), - sample_rate, - virtual_devices.clone(), - ) + input_callback(data, channels.into(), virtual_devices.clone()) } }, move |err| eprintln!("An error occurred on the input stream: {}", err), @@ -212,12 +196,7 @@ pub fn run(run: Run) { &config.into(), { move |data: &[f32], _| { - input_callback( - data, - channels.into(), - sample_rate, - virtual_devices.clone(), - ) + input_callback(data, channels.into(), virtual_devices.clone()) } }, move |err| eprintln!("An error occurred on the input stream: {}", err), @@ -250,8 +229,6 @@ pub fn run(run: Run) { .unwrap(); let config = device.default_output_config().unwrap(); - let sample_rate = config.sample_rate().0; - let virtual_device = virtual_devices .iter() .filter(|device| { @@ -370,12 +347,8 @@ fn create_virtual_device_input_stream( .unwrap() } -fn input_callback( - data: &[T], - channels: usize, - sample_rate: u32, - virtual_device: Arc>, -) where +fn input_callback(data: &[T], channels: usize, virtual_device: Arc>) +where T: Clone + num::cast::ToPrimitive, { let data: Vec = data.iter().map(|d| d.to_f32().unwrap()).collect(); diff --git a/src/device/virtual_device.rs b/src/device/virtual_device.rs index 12ddb7f..c68b297 100644 --- a/src/device/virtual_device.rs +++ b/src/device/virtual_device.rs @@ -9,7 +9,6 @@ pub struct VirtualDevice { output_index: HashMap>, output_buffer: HashMap>>, - simple_buffer: Vec>, } impl VirtualDevice { @@ -20,7 +19,6 @@ impl VirtualDevice { sample_rate, output_index: HashMap::new(), output_buffer: HashMap::new(), - simple_buffer: vec![vec![]; channels as usize], } }