aboutsummaryrefslogtreecommitdiffstats
path: root/mumd/src/network
diff options
context:
space:
mode:
authorRubens Brandao <git@rubens.io>2021-04-05 18:39:55 +0200
committerRubens Brandao <git@rubens.io>2021-04-05 18:39:55 +0200
commite431ecb6c5c8406bde6a54f40ee2f648cc0cec05 (patch)
tree93a227ab5f3ceac27286a1c2c36b79c12c72f95f /mumd/src/network
parent1734a72d3caff4f8831f4b366fdb818fddecf32f (diff)
downloadmum-e431ecb6c5c8406bde6a54f40ee2f648cc0cec05.tar.gz
Separate the input and output audio
Diffstat (limited to 'mumd/src/network')
-rw-r--r--mumd/src/network/tcp.rs4
-rw-r--r--mumd/src/network/udp.rs4
2 files changed, 4 insertions, 4 deletions
diff --git a/mumd/src/network/tcp.rs b/mumd/src/network/tcp.rs
index 6402a89..d2f0b41 100644
--- a/mumd/src/network/tcp.rs
+++ b/mumd/src/network/tcp.rs
@@ -108,7 +108,7 @@ pub async fn handle(
let password = state_lock.password().map(|x| x.to_string());
authenticate(&mut sink, username, password).await?;
let phase_watcher = state_lock.phase_receiver();
- let input_receiver = state_lock.audio().input_receiver();
+ let input_receiver = state_lock.audio_input().input_receiver();
drop(state_lock);
let event_queue = TcpEventQueue::new();
@@ -358,7 +358,7 @@ async fn listen(
state
.lock()
.await
- .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 5996e43..a8e190d 100644
--- a/mumd/src/network/udp.rs
+++ b/mumd/src/network/udp.rs
@@ -33,7 +33,7 @@ pub async fn handle(
mut connection_info_receiver: watch::Receiver<Option<ConnectionInfo>>,
mut crypt_state_receiver: mpsc::Receiver<ClientCryptState>,
) -> Result<(), UdpError> {
- let receiver = state.lock().await.audio().input_receiver();
+ let receiver = state.lock().await.audio_input().input_receiver();
loop {
let connection_info = 'data: loop {
@@ -151,7 +151,7 @@ async fn listen(
state
.lock() //TODO change so that we only have to lock audio and not the whole state
.await
- .audio()
+ .audio_output()
.decode_packet_payload(VoiceStreamType::UDP, session_id, payload);
}
}