diff options
| author | Kapten Z∅∅m <55669224+default-username-852@users.noreply.github.com> | 2021-01-07 22:22:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-07 22:22:24 +0100 |
| commit | 154a2930b3bbe5ede06648c3a10b8fa4904277f4 (patch) | |
| tree | 18ee2f8b569991d1d0e6b6248539f70da63a62d7 /mumd/src/audio | |
| parent | ba4aa72654f2d57d59f6e25151315213bec21192 (diff) | |
| parent | 62d3e3d6bf3842a1aad28874a69992b0b880137e (diff) | |
| download | mum-154a2930b3bbe5ede06648c3a10b8fa4904277f4.tar.gz | |
Merge pull request #58 from mum-rs/tcp-voice-tunnel-2
TCP voice tunnel
Diffstat (limited to 'mumd/src/audio')
| -rw-r--r-- | mumd/src/audio/output.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mumd/src/audio/output.rs b/mumd/src/audio/output.rs index 5e0cb8d..421d395 100644 --- a/mumd/src/audio/output.rs +++ b/mumd/src/audio/output.rs @@ -1,3 +1,5 @@ +use crate::network::VoiceStreamType; + use cpal::{OutputCallbackInfo, Sample}; use mumble_protocol::voice::VoicePacketPayload; use opus::Channels; @@ -73,7 +75,7 @@ impl SaturatingAdd for u16 { pub fn curry_callback<T: Sample + AddAssign + SaturatingAdd + std::fmt::Display>( effect_sound: Arc<Mutex<VecDeque<f32>>>, - user_bufs: Arc<Mutex<HashMap<u32, ClientStream>>>, + user_bufs: Arc<Mutex<HashMap<(VoiceStreamType, u32), ClientStream>>>, output_volume_receiver: watch::Receiver<f32>, user_volumes: Arc<Mutex<HashMap<u32, (f32, bool)>>>, ) -> impl FnMut(&mut [T], &OutputCallbackInfo) + Send + 'static { @@ -86,7 +88,7 @@ pub fn curry_callback<T: Sample + AddAssign + SaturatingAdd + std::fmt::Display> let mut effects_sound = effect_sound.lock().unwrap(); let mut user_bufs = user_bufs.lock().unwrap(); - for (id, client_stream) in &mut *user_bufs { + for ((_, id), client_stream) in &mut *user_bufs { let (user_volume, muted) = user_volumes .lock() .unwrap() |