diff options
Diffstat (limited to 'mumd')
| -rw-r--r-- | mumd/Cargo.toml | 1 | ||||
| -rw-r--r-- | mumd/src/network/udp.rs | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/mumd/Cargo.toml b/mumd/Cargo.toml index a853622..9d7eeaa 100644 --- a/mumd/Cargo.toml +++ b/mumd/Cargo.toml @@ -9,6 +9,7 @@ Mumble client daemon. """ repository = "https://github.com/sornas/mum" license = "MIT" +readme = "../README.md" [features] default = ["notifications"] diff --git a/mumd/src/network/udp.rs b/mumd/src/network/udp.rs index 3ca77af..086e072 100644 --- a/mumd/src/network/udp.rs +++ b/mumd/src/network/udp.rs @@ -33,7 +33,11 @@ pub async fn handle( mut connection_info_receiver: watch::Receiver<Option<ConnectionInfo>>, mut crypt_state_receiver: mpsc::Receiver<ClientCryptState>, ) -> Result<(), UdpError> { +<<<<<<< HEAD let receiver = state.read().unwrap().audio_input().receiver(); +======= + let receiver = state.read().unwrap().audio().input_receiver(); +>>>>>>> main loop { let connection_info = 'data: loop { @@ -151,7 +155,11 @@ async fn listen( state .read() .unwrap() +<<<<<<< HEAD .audio_output() +======= + .audio() +>>>>>>> main .decode_packet_payload(VoiceStreamType::UDP, session_id, payload); } } |