Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions native-bridge/src/audio/engine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,10 @@ impl AudioEngine {
.store(volume.to_bits(), Ordering::SeqCst);
}

pub fn is_monitoring(&self) -> bool {
self.is_monitoring.load(Ordering::Relaxed)
}

// === Track State ===

/// Update track state with partial update - only fields that are Some will be changed
Expand Down
17 changes: 15 additions & 2 deletions native-bridge/src/protocol/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -272,9 +272,17 @@ impl BridgeServer {
);
}

info!("[Server] Diagnostic: loop={}, empty_reads={}, cbs=({},{}), buffer={}% ({}/{}), healthy={}",
// Get monitoring state for diagnostics
let app = self.state.lock().await;
let levels = app.audio_engine.get_levels();
let is_monitoring = app.audio_engine.is_monitoring();
drop(app);

info!("[Server] Diagnostic: loop={}, empty_reads={}, cbs=({},{}), buffer={}% healthy={}, mon={}, in={:.3}/{:.3} out={:.3}/{:.3}",
loop_counter, empty_read_counter, input_cbs, output_cbs,
buffer_pct, buffer_used, buffer_capacity, healthy);
buffer_pct, healthy, is_monitoring,
levels.input_level_l, levels.input_level_r,
levels.output_level_l, levels.output_level_r);
last_diagnostic = Instant::now();
}

Expand Down Expand Up @@ -541,6 +549,11 @@ impl BridgeServer {
}

BrowserMessage::UpdateEffects { effects, .. } => {
info!("UpdateEffects received: {} effects configured",
[effects.wah.enabled, effects.overdrive.enabled, effects.distortion.enabled,
effects.amp.enabled, effects.compressor.enabled, effects.eq.enabled,
effects.reverb.enabled, effects.delay.enabled, effects.chorus.enabled]
.iter().filter(|&&e| e).count());
let app = self.state.lock().await;
app.audio_engine.update_effects(effects.clone());

Expand Down
42 changes: 28 additions & 14 deletions native-bridge/src/tui/ui.rs
Original file line number Diff line number Diff line change
Expand Up @@ -358,20 +358,31 @@ fn draw_network_panel(f: &mut Frame, app: &App, area: Rect) {
])
.split(inner);

// Connection info
let mode_color = match app.network_mode {
NetworkMode::Disconnected => Color::Red,
NetworkMode::Connecting => Color::Yellow,
NetworkMode::P2P => Color::Green,
NetworkMode::Relay => Color::Blue,
NetworkMode::Hybrid => Color::Cyan,
// Connection info - distinguish browser connection from P2P room status
let (mode_text, mode_color) = if app.network_connected {
match app.network_mode {
NetworkMode::Disconnected => ("Standby (no room)".to_string(), Color::Yellow),
NetworkMode::Connecting => ("Connecting...".to_string(), Color::Yellow),
NetworkMode::P2P => ("P2P Direct".to_string(), Color::Green),
NetworkMode::Relay => ("Relay Server".to_string(), Color::Blue),
NetworkMode::Hybrid => ("Hybrid P2P+Relay".to_string(), Color::Cyan),
}
} else {
("Offline".to_string(), Color::Red)
};

let conn_info = Paragraph::new(vec![
Line::from(vec![
Span::raw("Mode: "),
Span::raw("Browser: "),
Span::styled(
format!("{}", app.network_mode),
if app.network_connected { "Connected" } else { "Disconnected" },
Style::default().fg(if app.network_connected { Color::Green } else { Color::Red }).add_modifier(Modifier::BOLD),
),
]),
Line::from(vec![
Span::raw("Room: "),
Span::styled(
mode_text,
Style::default().fg(mode_color).add_modifier(Modifier::BOLD),
),
]),
Expand Down Expand Up @@ -571,16 +582,19 @@ fn draw_sidebar(f: &mut Frame, app: &App, area: Rect) {
.block(Block::default().title("Meters").borders(Borders::TOP));
f.render_widget(levels, chunks[0]);

// Mini network
let net_status = if app.network_connected {
format!("{} ({})", app.network_mode, app.peer_count)
// Mini network - show clearer status
let (net_status, net_color) = if app.network_connected {
match app.network_mode {
NetworkMode::Disconnected => ("Standby".to_string(), Color::Yellow), // Browser connected, no room
_ => (format!("{} ({})", app.network_mode, app.peer_count), Color::Green),
}
} else {
"Offline".to_string()
("Offline".to_string(), Color::Red)
};
let network = Paragraph::new(vec![
Line::from(Span::styled(
net_status,
Style::default().fg(if app.network_connected { Color::Green } else { Color::Red }),
Style::default().fg(net_color),
)),
Line::from(vec![
Span::raw("RTT: "),
Expand Down
Loading