aboutsummaryrefslogtreecommitdiffstats
path: root/mumd/src/network/udp.rs
diff options
context:
space:
mode:
Diffstat (limited to 'mumd/src/network/udp.rs')
-rw-r--r--mumd/src/network/udp.rs8
1 files changed, 8 insertions, 0 deletions
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);
}
}