diff options
Diffstat (limited to 'mumd/src/network')
| -rw-r--r-- | mumd/src/network/tcp.rs | 4 | ||||
| -rw-r--r-- | mumd/src/network/udp.rs | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/mumd/src/network/tcp.rs b/mumd/src/network/tcp.rs index 02477dc..7606987 100644 --- a/mumd/src/network/tcp.rs +++ b/mumd/src/network/tcp.rs @@ -112,7 +112,7 @@ pub async fn handle( let (phase_watcher, input_receiver) = { let state_lock = state.read().unwrap(); (state_lock.phase_receiver(), - state_lock.audio().input_receiver()) + state_lock.audio_input().receiver()) }; let event_queue = TcpEventQueue::new(); @@ -362,7 +362,7 @@ async fn listen( state .read() .unwrap() - .audio() + .audio_output() .decode_packet_payload( VoiceStreamType::TCP, session_id, diff --git a/mumd/src/network/udp.rs b/mumd/src/network/udp.rs index cc085b5..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); } } |