drop cpal, signal from rust-whisper-lib and accept channel

rust-whisper-lib/src/lib.rs

@@ -1,6 +1,4 @@
 use whisper_rs::{WhisperContext, FullParams, SamplingStrategy, WhisperError};
-use cpal::traits::{HostTrait, DeviceTrait, StreamTrait};
-use signal_hook::{iterator::Signals, consts::signal::SIGINT};
 use std::time::{Duration, Instant};
 use clap::Parser;
 use std::thread;
@@ -74,7 +72,7 @@ pub fn main_stream<F>(flags: Flags, handler_fn: F, _stream: std::sync::mpsc::Rec
    };
    let mut buffer = vec![];
    let mut last = Instant::now();
-   new_listener().listen(move |data: Vec<f32>| {
+   for data in _stream.iter() {
       data.iter().for_each(|x| buffer.push(*x));
       if Instant::now() - last > stream_step {
          w.transcribe_async(&buffer).unwrap();
@@ -99,7 +97,7 @@ pub fn main_stream<F>(flags: Flags, handler_fn: F, _stream: std::sync::mpsc::Rec
          buffer.truncate(stream_retain);
          last = Instant::now();
       }
-   });
+   }
 }
 
 struct Service {
@@ -330,69 +328,6 @@ impl Transcribed {
    }
 }
 
-struct Listener {
-}
-
-fn new_listener() -> Listener {
-   Listener{}
-}
-
-impl Listener {
-   fn listen(self, mut cb: impl FnMut(Vec<f32>)) {
-      let (send, recv) = std::sync::mpsc::sync_channel(100);
-      thread::spawn(move || { self._listen(send); });
-      loop {
-         match recv.recv() {
-            Ok(msg) => cb(msg),
-            Err(_) => return,
-         };
-      }
-   }
-
-   fn _listen(self, send: std::sync::mpsc::SyncSender<Vec<f32>>) {
-      let host = cpal::default_host();
-      let device = host.default_input_device().unwrap();
-      let cfg = device.supported_input_configs()
-         .unwrap()
-         .filter(|x| x.sample_format() == cpal::SampleFormat::F32)
-         .nth(0)
-         .unwrap()
-         .with_max_sample_rate();
-
-      let downsample_ratio = cfg.channels() as f32 * (cfg.sample_rate().0 as f32 / 16_000.0);
-      let stream = device.build_input_stream(
-         &cfg.clone().into(),
-         move |data: &[f32], _: &cpal::InputCallbackInfo| {
-            let mut downsampled_data = vec![];
-            for i in 0..(data.len() as f32 / downsample_ratio) as usize {
-               let mut upsampled = i as f32 * downsample_ratio;
-               if upsampled > (data.len()-1) as f32 {
-                  upsampled = (data.len()-1) as f32
-               }
-               downsampled_data.push(data[upsampled as usize]);
-            }
-            match send.try_send(downsampled_data) {
-               Ok(_) => (),
-               Err(msg) => eprintln!("failed to ingest audio: {}", msg),
-            };
-         },
-         move |err| {
-            eprintln!("input error: {}", err)
-         },
-         None,
-      ).unwrap();
-      stream.play().unwrap();
-
-      eprintln!("listening on {}", device.name().unwrap());
-      let mut signals = Signals::new(&[SIGINT]).unwrap();
-      for sig in signals.forever() {
-         eprintln!("sig {}", sig);
-         break;
-      }
-      stream.pause().unwrap();
-   }
-}
-
 #[cfg(test)]
 mod tests {
    use super::*;