diff options
| author | Rubens Brandao <git@rubens.io> | 2021-04-09 20:09:37 +0200 |
|---|---|---|
| committer | Rubens Brandao <git@rubens.io> | 2021-04-09 20:09:37 +0200 |
| commit | 47c47bf462d508176060f575960d96f01908bb70 (patch) | |
| tree | 9e3f7b328ae74e7c80b0843ffc66ce29a17108de /mumd/src | |
| parent | 7c5f60f210bfd05ea22d3a65f04e245989fdaade (diff) | |
| parent | a13d4b7d10aff81823b8cabf1d72daa881d36065 (diff) | |
| download | mum-47c47bf462d508176060f575960d96f01908bb70.tar.gz | |
Merge branch 'main' into multiple-audio
Diffstat (limited to 'mumd/src')
| -rw-r--r-- | mumd/src/network/udp.rs | 8 |
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); } } |