diff --git a/src/talk/gst.rs b/src/talk/gst.rs index b4b309f..b0e44b7 100644 --- a/src/talk/gst.rs +++ b/src/talk/gst.rs @@ -8,26 +8,11 @@ use std::sync::mpsc::{sync_channel, Receiver, SyncSender}; use super::errors::Error; use byte_slice_cast::*; -pub(super) fn file_input( - filename: &str, +pub(super) fn from_input( + input_src: &str, volume: f32, block_align: u16, sample_rate: u16, -) -> Result>, Error> { - let pipeline = create_pipeline( - &format!("filesrc location={}", filename), - volume, - block_align, - sample_rate, - )?; - input(pipeline) -} - -pub(super) fn mic_input( - volume: f32, - block_align: u16, - sample_rate: u16, - input_src:&str, ) -> Result>, Error> { let pipeline = create_pipeline(input_src, volume, block_align, sample_rate)?; input(pipeline) diff --git a/src/talk/mod.rs b/src/talk/mod.rs index fd730b5..94a4c08 100644 --- a/src/talk/mod.rs +++ b/src/talk/mod.rs @@ -79,13 +79,13 @@ pub fn main(opt: Opt) -> Result<(), Error> { } let rx = match (&opt.file_path, &opt.microphone) { - (Some(path), false) => gst::file_input( - path.to_str().expect("File path not UTF8 complient"), + (Some(path), false) => gst::from_input( + &format!("filesrc location={}", path.to_str().expect("File path not UTF8 complient")), opt.volume, block_size, sample_rate, )?, - (None, true) => gst::mic_input(opt.volume, block_size, sample_rate, &opt.input_src)?, + (None, true) => gst::from_input(&opt.input_src, opt.volume, block_size, sample_rate)?, _ => unreachable!(), };