From 95c79816327c6a5dc0a792fb615ded89e461f35b Mon Sep 17 00:00:00 2001 From: Liam Warfield Date: Mon, 19 Jan 2026 13:29:42 -0700 Subject: [PATCH] Refactor web.rs match statement. --- gui/src/imp/web.rs | 44 +++++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/gui/src/imp/web.rs b/gui/src/imp/web.rs index 570f2e9..a829311 100644 --- a/gui/src/imp/web.rs +++ b/gui/src/imp/web.rs @@ -3,7 +3,6 @@ use crate::effects::{AudioProcessor, AudioProcessorSender, TransmitState}; use color_eyre::eyre::{bail, eyre, Error}; use crossbeam::atomic::AtomicCell; use dioxus::prelude::*; -use std::sync::Arc; use futures::{AsyncRead, AsyncWrite}; use gloo_timers::future::TimeoutFuture; use js_sys::Float32Array; @@ -11,6 +10,7 @@ use mumble_protocol::control::ClientControlCodec; use mumble_web2_common::{ClientConfig, ServerStatus}; use reqwest::Url; use std::future::Future; +use std::sync::Arc; use std::time::Duration; use tracing::level_filters::LevelFilter; use tracing::{debug, error, info, instrument}; @@ -120,7 +120,10 @@ impl AudioSystem { self.processors.store(Some(processor)) } - pub fn start_recording(&mut self, each: impl FnMut(Vec, bool) + 'static) -> Result<(), Error> { + pub fn start_recording( + &mut self, + each: impl FnMut(Vec, bool) + 'static, + ) -> Result<(), Error> { let audio_context_worklet = self.webctx.clone(); let processors = self.processors.clone(); spawn(async move { @@ -312,34 +315,21 @@ async fn run_encoder_worklet( // Don't encode or send anything return; } - TransmitState::Transmitting => { - // Normal transmission - match AudioData::new(frame.unchecked_ref()) { - Ok(data) => { - let _ = audio_encoder.encode(&data); - } - Err(err) => { - error!( - "error creating AudioData object {:?} during event {:?}", - err, event, - ); - } - } - } + TransmitState::Transmitting => (), // Normal transmission TransmitState::Terminator => { // Mark this as a terminator before encoding pending_terminator.store(true); - match AudioData::new(frame.unchecked_ref()) { - Ok(data) => { - let _ = audio_encoder.encode(&data); - } - Err(err) => { - error!( - "error creating AudioData object {:?} during event {:?}", - err, event, - ); - } - } + } + } + match AudioData::new(frame.unchecked_ref()) { + Ok(data) => { + let _ = audio_encoder.encode(&data); + } + Err(err) => { + error!( + "error creating AudioData object {:?} during event {:?}", + err, event, + ); } } });