diff options
| -rw-r--r-- | PKGBUILD | 31 | ||||
| -rw-r--r-- | mumctl/src/main.rs | 20 | ||||
| -rw-r--r-- | mumd/src/audio.rs | 25 | ||||
| -rw-r--r-- | mumd/src/network/tcp.rs | 1 | ||||
| -rw-r--r-- | mumd/src/state.rs | 4 | ||||
| -rw-r--r-- | mumlib/src/command.rs | 1 | ||||
| -rw-r--r-- | usage.org | 8 |
7 files changed, 50 insertions, 40 deletions
diff --git a/PKGBUILD b/PKGBUILD deleted file mode 100644 index fd586f7..0000000 --- a/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# Maintainer: Eskil Queseth <eskilq at kth dot se> -# Maintainer: Gustav Sörnäs <gustav at sornas dot net> - -pkgname=mum-git -pkgver=0.1.0 -pkgrel=1 -pkgdesc="A mumble client/daemon pair" -arch=('x86_64') -url="https://github.com/sornas/mum.git" -license=('MIT') -sha256sums=('SKIP') -depends=('alsa-lib' 'opus' 'openssl') -makedepends=('git' 'rust') -source=("git+$url") - -build() { - cd "${srcdir}/${pkgname%-git}" - cargo build --release --target-dir=target -} - -check() { - cd "${srcdir}/${pkgname%-git}" - cargo test --release --target-dir=target -} - -package() { - cd "${srcdir}/${pkgname%-git}" - install -Dm 755 target/release/mumctl -t "${pkgdir}/usr/bin" - install -Dm 755 target/release/mumd -t "${pkgdir}/usr/bin" - install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}" -} diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs index 2db9ded..82fcab6 100644 --- a/mumctl/src/main.rs +++ b/mumctl/src/main.rs @@ -1,9 +1,9 @@ use clap::{App, AppSettings, Arg, Shell, SubCommand}; +use colored::Colorize; use ipc_channel::ipc::{self, IpcSender}; use mumlib::command::{Command, CommandResponse}; use mumlib::setup_logger; use std::{fs, io}; -use colored::Colorize; macro_rules! err_print { ($func:expr) => { @@ -39,6 +39,11 @@ fn main() { .arg(Arg::with_name("channel") .required(true)))) .subcommand(SubCommand::with_name("status")) + .subcommand(SubCommand::with_name("config") + .arg(Arg::with_name("name") + .required(true)) + .arg(Arg::with_name("value") + .required(true))) .subcommand(SubCommand::with_name("completions") .arg(Arg::with_name("zsh") .long("zsh")) @@ -84,6 +89,19 @@ fn main() { } let res = send_command(Command::Status).unwrap().unwrap(); println!("{:#?}", res); + } else if let Some(matches) = matches.subcommand_matches("config") { + let name = matches.value_of("name").unwrap(); + let value = matches.value_of("value").unwrap(); + match name { + "audio.input_volume" => { + if let Ok(volume) = value.parse() { + send_command(Command::InputVolumeSet(volume)).unwrap(); + } + }, + _ => { + println!("{} Unknown config value {}", "error:".red(), name); + } + } } else if let Some(matches) = matches.subcommand_matches("completions") { app.gen_completions_to("mumctl", match matches.value_of("shell").unwrap_or("zsh") { diff --git a/mumd/src/audio.rs b/mumd/src/audio.rs index edc2f7f..828942b 100644 --- a/mumd/src/audio.rs +++ b/mumd/src/audio.rs @@ -13,13 +13,13 @@ use std::ops::AddAssign; use std::sync::Arc; use std::sync::Mutex; use tokio::sync::mpsc::{self, Receiver, Sender}; +use tokio::sync::watch; struct ClientStream { buffer: VecDeque<f32>, //TODO ring buffer? opus_decoder: opus::Decoder, } -//TODO remove pub where possible pub struct Audio { pub output_config: StreamConfig, pub output_stream: Stream, @@ -27,12 +27,12 @@ pub struct Audio { pub input_config: StreamConfig, pub input_stream: Stream, pub input_buffer: Arc<Mutex<VecDeque<f32>>>, - input_channel_receiver: Option<Receiver<VoicePacketPayload>>, //TODO unbounded? mbe ring buffer and drop the first packet + input_channel_receiver: Option<Receiver<VoicePacketPayload>>, + input_volume_sender: watch::Sender<f32>, - client_streams: Arc<Mutex<HashMap<u32, ClientStream>>>, //TODO move to user state + client_streams: Arc<Mutex<HashMap<u32, ClientStream>>>, } -//TODO split into input/output impl Audio { pub fn new() -> Self { let host = cpal::default_host(); @@ -99,6 +99,8 @@ impl Audio { .unwrap(); let (input_sender, input_receiver) = mpsc::channel(100); + let (input_volume_sender, input_volume_receiver) = watch::channel::<f32>(1.0); + let input_buffer = Arc::new(Mutex::new(VecDeque::new())); let input_stream = match input_supported_sample_format { SampleFormat::F32 => input_device.build_input_stream( @@ -107,6 +109,7 @@ impl Audio { input_encoder, input_sender, input_config.sample_rate.0, + input_volume_receiver.clone(), 4, // 10 ms ), err_fn, @@ -117,6 +120,7 @@ impl Audio { input_encoder, input_sender, input_config.sample_rate.0, + input_volume_receiver.clone(), 4, // 10 ms ), err_fn, @@ -127,6 +131,7 @@ impl Audio { input_encoder, input_sender, input_config.sample_rate.0, + input_volume_receiver.clone(), 4, // 10 ms ), err_fn, @@ -142,6 +147,7 @@ impl Audio { input_config, input_stream, input_buffer, + input_volume_sender, input_channel_receiver: Some(input_receiver), client_streams, } @@ -195,6 +201,10 @@ impl Audio { pub fn clear_clients(&mut self) { self.client_streams.lock().unwrap().clear(); } + + pub fn set_input_volume(&self, input_volume: f32) { + self.input_volume_sender.broadcast(input_volume).unwrap(); + } } impl ClientStream { @@ -280,6 +290,7 @@ fn input_callback<T: Sample>( mut opus_encoder: opus::Encoder, mut input_sender: Sender<VoicePacketPayload>, sample_rate: u32, + input_volume_receiver: watch::Receiver<f32>, opus_frame_size_blocks: u32, // blocks of 2.5ms ) -> impl FnMut(&[T], &InputCallbackInfo) + Send + 'static { if !(opus_frame_size_blocks == 1 @@ -297,7 +308,10 @@ fn input_callback<T: Sample>( let buf = Arc::new(Mutex::new(VecDeque::new())); move |data: &[T], _info: &InputCallbackInfo| { let mut buf = buf.lock().unwrap(); - let out: Vec<f32> = data.iter().map(|e| e.to_f32()).collect(); + let input_volume = *input_volume_receiver.borrow(); + let out: Vec<f32> = data.iter().map(|e| e.to_f32()) + .map(|e| e * input_volume) + .collect(); buf.extend(out); while buf.len() >= opus_frame_size as usize { let tail = buf.split_off(opus_frame_size as usize); @@ -308,7 +322,6 @@ fn input_callback<T: Sample>( opus_buf.truncate(result); let bytes = Bytes::copy_from_slice(&opus_buf); match input_sender.try_send(VoicePacketPayload::Opus(bytes, false)) { - //TODO handle full buffer / disconnect Ok(_) => {} Err(_e) => { //warn!("Error sending audio packet: {:?}", e); diff --git a/mumd/src/network/tcp.rs b/mumd/src/network/tcp.rs index ea4ef86..88d2b59 100644 --- a/mumd/src/network/tcp.rs +++ b/mumd/src/network/tcp.rs @@ -233,7 +233,6 @@ async fn listen( break; } Some(Some(packet)) => { - //TODO handle types separately match packet.unwrap() { ControlPacket::TextMessage(msg) => { info!( diff --git a/mumd/src/state.rs b/mumd/src/state.rs index 2c48955..fd1c831 100644 --- a/mumd/src/state.rs +++ b/mumd/src/state.rs @@ -157,6 +157,10 @@ impl State { .unwrap(); (false, Ok(None)) } + Command::InputVolumeSet(volume) => { + self.audio.set_input_volume(volume); + (false, Ok(None)) + } } } diff --git a/mumlib/src/command.rs b/mumlib/src/command.rs index a0673f4..b27d3ca 100644 --- a/mumlib/src/command.rs +++ b/mumlib/src/command.rs @@ -9,6 +9,7 @@ pub enum Command { channel_identifier: String, }, ChannelList, + InputVolumeSet(f32), ServerConnect { host: String, port: u16, @@ -50,7 +50,7 @@ root [3](4) someone eating food #+END_SRC -**** TODO --short +**** DONE --short #+BEGIN_SRC bash $ mumctl channel list --short root [3](4) @@ -139,3 +139,9 @@ server offered invalid key. what do you want to do? #+BEGIN_SRC bash $ mumctl server rename loopback my_server #+END_SRC +** config +#+BEGIN_SRC bash +$ mumctl config audio.input_volume 1.1 +$ mumctl config audio.input_volume +$ mumctl config audio.input_volume --help +#+END_SRC |