Settings: Move force_software_decoder above mediacodec_extra_options,…

… Logging: cargo fmt --all
alvr-org · Dec 20, 2023 · d9a8731 · d9a8731
1 parent 97eff12
commit d9a8731
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/alvr/common/src/logging.rs b/alvr/common/src/logging.rs
@@ -128,7 +128,8 @@ pub fn show_e_blocking<E: Display>(e: E) {
 }
 
 pub fn show_err<T, E: Display>(res: Result<T, E>) -> Option<T> {
-    res.map_err(|e| show_e_block(format!("{:#}", e), false)).ok()
+    res.map_err(|e| show_e_block(format!("{:#}", e), false))
+        .ok()
 }
 
 pub fn show_err_blocking<T, E: Display>(res: Result<T, E>) -> Option<T> {

diff --git a/alvr/session/src/settings.rs b/alvr/session/src/settings.rs
@@ -472,18 +472,18 @@ pub struct VideoConfig {
     #[schema(flag = "steamvr-restart")]
     pub encoder_config: EncoderConfig,
 
+    #[schema(strings(
+        help = "Attempts to use a software decoder on the device. Slow, but may work around broken codecs."
+    ))]
+    pub force_software_decoder: bool,
+
     pub mediacodec_extra_options: Vec<(String, MediacodecDataType)>,
 
     #[schema(flag = "steamvr-restart")]
     pub foveated_encoding: Switch<FoveatedEncodingConfig>,
 
     pub clientside_foveation: Switch<ClientsideFoveationConfig>,
 
-    #[schema(strings(
-        help = "Attempts to use a software decoder on the device. Slow, but may work around broken codecs."
-    ))]
-    pub force_software_decoder: bool,
-
     #[schema(flag = "steamvr-restart")]
     pub color_correction: Switch<ColorCorrectionConfig>,
 }