aboutsummaryrefslogtreecommitdiffstats
path: root/mumd/src/network/udp.rs
diff options
context:
space:
mode:
authorEskil Q <eskilq@kth.se>2021-01-06 18:31:49 +0100
committerEskil Q <eskilq@kth.se>2021-01-06 18:31:49 +0100
commit02e6f2b84d72294b29a1698c1b73fbb5697815da (patch)
treeaf85a0277c89ef7983f79ff795acf1bd94eee848 /mumd/src/network/udp.rs
parentb15e010a6bebc7b7c6b8afb1b51f2673d0695e06 (diff)
downloadmum-02e6f2b84d72294b29a1698c1b73fbb5697815da.tar.gz
clean up network::run_until
Diffstat (limited to 'mumd/src/network/udp.rs')
-rw-r--r--mumd/src/network/udp.rs8
1 files changed, 2 insertions, 6 deletions
diff --git a/mumd/src/network/udp.rs b/mumd/src/network/udp.rs
index 5e725cd..d35a255 100644
--- a/mumd/src/network/udp.rs
+++ b/mumd/src/network/udp.rs
@@ -233,22 +233,18 @@ async fn send_voice(
let inner_phase_watcher = phase_watcher.clone();
run_until(
|phase| matches!(phase, StatePhase::Disconnected),
- || async {
+ async {
run_until(
|phase| !matches!(phase, StatePhase::Connected(VoiceStreamType::UDP)),
- || async {
+ async {
debug!("Sending UDP audio");
sink.lock().unwrap().send((receiver.lock().await.next().await.unwrap(), server_addr)).await.unwrap();
debug!("Sent UDP audio");
- Some(Some(()))
},
- |_| async {},
|| async {},
inner_phase_watcher.clone(),
).await;
- Some(Some(()))
},
- |_| async {},
|| async {},
phase_watcher,
).await;