diff --git a/client/Cargo.toml b/client/Cargo.toml index 3bfac70..b0dacfe 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -4,7 +4,7 @@ path = "src/main.rs" [package] name = "lesavka_client" -version = "0.7.1" +version = "0.7.2" edition = "2024" [dependencies] diff --git a/client/src/launcher/diagnostics.rs b/client/src/launcher/diagnostics.rs index 633fcbd..8e54b4b 100644 --- a/client/src/launcher/diagnostics.rs +++ b/client/src/launcher/diagnostics.rs @@ -70,7 +70,7 @@ pub struct SnapshotReport { pub remote_active: bool, pub power_state: String, pub preview_source: String, - pub breakout_display: String, + pub client_display_limit: String, pub left_surface: String, pub left_capture_profile: String, pub left_capture_transport: String, @@ -114,7 +114,7 @@ impl SnapshotReport { "{}x{} @ {} fps", state.preview_source.width, state.preview_source.height, state.preview_source.fps ), - breakout_display: format!( + client_display_limit: format!( "{}x{}", state.breakout_display.width, state.breakout_display.height ), @@ -184,7 +184,7 @@ impl SnapshotReport { self.routing, self.view_mode, self.remote_active, self.power_state ); let _ = writeln!(text, "source feed: {}", self.preview_source); - let _ = writeln!(text, "breakout display: {}", self.breakout_display); + let _ = writeln!(text, "client display limit: {}", self.client_display_limit); let _ = writeln!(text); let _ = writeln!(text, "left eye"); let _ = writeln!(text, " surface: {}", self.left_surface); diff --git a/client/src/launcher/state.rs b/client/src/launcher/state.rs index c1a5b7f..9101197 100644 --- a/client/src/launcher/state.rs +++ b/client/src/launcher/state.rs @@ -686,7 +686,10 @@ fn capture_size_options(source: PreviewSourceSize) -> Vec { ] { let choice = capture_size_choice(source, preset); if options.iter().any(|existing: &CaptureSizeChoice| { - existing.width == choice.width + let existing_transport = existing.preset.transport_label(); + let current_transport = choice.preset.transport_label(); + existing_transport == current_transport + && existing.width == choice.width && existing.height == choice.height && existing.fps == choice.fps && existing.max_bitrate_kbit == choice.max_bitrate_kbit @@ -933,6 +936,11 @@ mod tests { && choice.width == 1920 && choice.height == 1080 })); + assert!(capture_options.iter().any(|choice| { + choice.preset == CaptureSizePreset::P1080 + && choice.width == 1920 + && choice.height == 1080 + })); let breakout_options = state.breakout_size_options(); assert!(breakout_options.len() >= 5); diff --git a/client/src/launcher/ui_components.rs b/client/src/launcher/ui_components.rs index 32c9ecb..8d5b7fb 100644 --- a/client/src/launcher/ui_components.rs +++ b/client/src/launcher/ui_components.rs @@ -839,7 +839,7 @@ pub fn sync_capture_size_combo( option.max_bitrate_kbit ), _ => format!( - "{} • {}x{} @ {} fps • {} kbit", + "{} • {}x{} @ {} fps • {} kbit (Re-encode)", option.preset.label(), option.width, option.height, diff --git a/common/Cargo.toml b/common/Cargo.toml index 7f7de4c..d84cd40 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lesavka_common" -version = "0.7.1" +version = "0.7.2" edition = "2024" build = "build.rs" diff --git a/common/src/cli.rs b/common/src/cli.rs index 5dc5706..fe7ef83 100644 --- a/common/src/cli.rs +++ b/common/src/cli.rs @@ -17,6 +17,6 @@ mod tests { #[test] fn banner_includes_version() { - assert_eq!(banner("0.7.1"), "lesavka-common CLI (v0.7.1)"); + assert_eq!(banner("0.7.2"), "lesavka-common CLI (v0.7.2)"); } } diff --git a/server/Cargo.toml b/server/Cargo.toml index c998a27..928ab17 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -10,7 +10,7 @@ bench = false [package] name = "lesavka_server" -version = "0.7.1" +version = "0.7.2" edition = "2024" autobins = false