From b3339294dac5a7f448de8c3849ab198afff8d14b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= <gustav@sornas.net>
Date: Sat, 10 Oct 2020 22:25:05 +0200
Subject: handle multiple incoming audio streams

Co-authored-by: Eskil Queseth <eskilq@kth.se>
---
 mumd/src/main.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'mumd/src/main.rs')

diff --git a/mumd/src/main.rs b/mumd/src/main.rs
index 3960b48..4c3b67c 100644
--- a/mumd/src/main.rs
+++ b/mumd/src/main.rs
@@ -10,6 +10,8 @@ use futures::channel::oneshot;
 use futures::join;
 use mumble_protocol::crypt::ClientCryptState;
 use std::net::ToSocketAddrs;
+use std::sync::Arc;
+use std::sync::Mutex;
 
 #[tokio::main]
 async fn main() {
@@ -47,6 +49,7 @@ async fn main() {
 
     let audio = Audio::new();
     audio.output_stream.play().unwrap();
+    let audio = Arc::new(Mutex::new(audio));
 
     // Run it
     join!(
@@ -56,7 +59,12 @@ async fn main() {
             username,
             accept_invalid_cert,
             crypt_state_sender,
+            Arc::clone(&audio),
         ),
-        network::handle_udp(server_addr, crypt_state_receiver, audio,)
+        network::handle_udp(
+            server_addr,
+            crypt_state_receiver,
+            audio,
+        )
     );
 }
-- 
cgit v1.2.1