[style](trx-client): improve audio and HTTP frontend code formatting
Reformat multi-line statements and function calls for better readability. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -63,7 +63,8 @@ pub fn spawn_audio_bridge(
|
||||
let playback_cfg = cfg.clone();
|
||||
let playback_info = info.clone();
|
||||
let playback = std::thread::spawn(move || {
|
||||
if let Err(e) = run_playback(playback_cfg, playback_info, rx_bridge_rx, playback_stop)
|
||||
if let Err(e) =
|
||||
run_playback(playback_cfg, playback_info, rx_bridge_rx, playback_stop)
|
||||
{
|
||||
warn!("Audio bridge playback stopped: {}", e);
|
||||
}
|
||||
@@ -143,7 +144,8 @@ fn run_playback(
|
||||
buffer_size: cpal::BufferSize::Default,
|
||||
};
|
||||
let channels = stream_cfg.channels as usize;
|
||||
let frame_samples = (info.sample_rate as usize * info.frame_duration_ms as usize / 1000) * channels;
|
||||
let frame_samples =
|
||||
(info.sample_rate as usize * info.frame_duration_ms as usize / 1000) * channels;
|
||||
|
||||
let opus_channels = match stream_cfg.channels {
|
||||
1 => opus::Channels::Mono,
|
||||
@@ -153,7 +155,9 @@ fn run_playback(
|
||||
let mut decoder = opus::Decoder::new(info.sample_rate, opus_channels)?;
|
||||
let mut pcm_buf = vec![0f32; 5760 * channels];
|
||||
|
||||
let ring = Arc::new(Mutex::new(VecDeque::<f32>::with_capacity(frame_samples * 8)));
|
||||
let ring = Arc::new(Mutex::new(VecDeque::<f32>::with_capacity(
|
||||
frame_samples * 8,
|
||||
)));
|
||||
let ring_cb = ring.clone();
|
||||
let rx_gain = cfg.rx_gain.max(0.0);
|
||||
|
||||
@@ -218,14 +222,16 @@ fn run_capture(
|
||||
buffer_size: cpal::BufferSize::Default,
|
||||
};
|
||||
let channels = stream_cfg.channels as usize;
|
||||
let frame_samples = (info.sample_rate as usize * info.frame_duration_ms as usize / 1000) * channels;
|
||||
let frame_samples =
|
||||
(info.sample_rate as usize * info.frame_duration_ms as usize / 1000) * channels;
|
||||
|
||||
let opus_channels = match stream_cfg.channels {
|
||||
1 => opus::Channels::Mono,
|
||||
2 => opus::Channels::Stereo,
|
||||
_ => return Err(format!("unsupported channel count {}", stream_cfg.channels).into()),
|
||||
};
|
||||
let mut encoder = opus::Encoder::new(info.sample_rate, opus_channels, opus::Application::Audio)?;
|
||||
let mut encoder =
|
||||
opus::Encoder::new(info.sample_rate, opus_channels, opus::Application::Audio)?;
|
||||
encoder.set_bitrate(opus::Bitrate::Bits(24_000))?;
|
||||
let mut opus_buf = vec![0u8; 4096];
|
||||
|
||||
|
||||
@@ -6,10 +6,10 @@
|
||||
mod api;
|
||||
#[path = "audio.rs"]
|
||||
pub mod audio;
|
||||
#[path = "status.rs"]
|
||||
pub mod status;
|
||||
#[path = "auth.rs"]
|
||||
pub mod auth;
|
||||
#[path = "status.rs"]
|
||||
pub mod status;
|
||||
|
||||
use std::net::SocketAddr;
|
||||
use std::sync::atomic::AtomicUsize;
|
||||
@@ -86,7 +86,7 @@ fn build_server(
|
||||
let same_site = match context.http_auth_cookie_same_site.as_str() {
|
||||
"Strict" => SameSite::Strict,
|
||||
"None" => SameSite::None,
|
||||
_ => SameSite::Lax, // default
|
||||
_ => SameSite::Lax, // default
|
||||
};
|
||||
let auth_config = AuthConfig::new(
|
||||
context.http_auth_enabled,
|
||||
@@ -129,7 +129,9 @@ fn build_server(
|
||||
)
|
||||
// Use "real IP" so reverse-proxy setups can pass client address
|
||||
// via Forwarded / X-Forwarded-For / X-Real-IP headers.
|
||||
.wrap(Logger::new(r#"%{r}a "%r" %s %b "%{Referer}i" "%{User-Agent}i" %T"#))
|
||||
.wrap(Logger::new(
|
||||
r#"%{r}a "%r" %s %b "%{Referer}i" "%{User-Agent}i" %T"#,
|
||||
))
|
||||
.wrap(auth::AuthMiddleware)
|
||||
.configure(api::configure)
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user