better coordinates + fix settings

Author: Brendonovich

apps/desktop/src-tauri/src/web_api.rs

@@ -9,13 +9,6 @@ pub fn make_url(pathname: impl AsRef<str>) -> String {
     format!("{server_url_base}{}", pathname.as_ref())
 }
 
-pub async fn do_request(
-    build: impl FnOnce(reqwest::Client) -> reqwest::RequestBuilder,
-) -> Result<reqwest::Response, reqwest::Error> {
-    let client = reqwest::Client::new();
-    build(client).send().await
-}
-
 async fn do_authed_request(
     auth: &AuthStore,
     build: impl FnOnce(reqwest::Client) -> reqwest::RequestBuilder,

apps/desktop/src/routes/(window-chrome)/settings/general.tsx

@@ -45,21 +45,15 @@ export default function GeneralSettings() {
   const [store] = createResource(() => generalSettingsStore.get());
 
   return (
-    <Show
-      when={(() => {
-        const s = store();
-        if (s === undefined) return;
-        return [s];
-      })()}
-    >
-      {(store) => <Inner store={store()[0]} />}
+    <Show when={store.state === "ready" && ([store()] as const)}>
+      {(store) => <Inner initialStore={store()[0] ?? null} />}
     </Show>
   );
 }
 
-function Inner(props: { store: GeneralSettingsStore | null }) {
+function Inner(props: { initialStore: GeneralSettingsStore | null }) {
   const [settings, setSettings] = createStore<GeneralSettingsStore>(
-    props.store ?? {
+    props.initialStore ?? {
       upload_individual_files: false,
       open_editor_after_recording: false,
       hide_dock_icon: false,

apps/desktop/src/routes/(window-chrome)/settings/hotkeys.tsx

@@ -31,22 +31,16 @@ export default function () {
   const [store] = createResource(() => hotkeysStore.get());
 
   return (
-    <Show
-      when={(() => {
-        const s = store();
-        if (s === undefined) return;
-        return [s];
-      })()}
-    >
-      {(store) => <Inner store={store()[0]} />}
+    <Show when={store.state === "ready" && ([store()] as const)}>
+      {(store) => <Inner initialStore={store()[0] ?? null} />}
     </Show>
   );
 }
 
-function Inner(props: { store: HotkeysStore | null }) {
+function Inner(props: { initialStore: HotkeysStore | null }) {
   const [hotkeys, setHotkeys] = createStore<{
     [K in HotkeyAction]?: Hotkey;
-  }>(props.store?.hotkeys ?? {});
+  }>(props.initialStore?.hotkeys ?? {});
 
   createEffect(() => {
     // biome-ignore lint/suspicious/noExplicitAny: specta#283

crates/media/src/encoders/h264.rs

@@ -1,6 +1,6 @@
 use ffmpeg::{
     codec::{codec::Codec, context, encoder},
-    format::{self, pixel::Pixel},
+    format::{self},
     threading::Config,
     Dictionary,
 };

crates/media/src/feeds/camera.rs

@@ -2,7 +2,6 @@ use ffmpeg::software::scaling;
 use flume::{Receiver, Sender, TryRecvError};
 use nokhwa::{pixel_format::*, utils::*, Camera};
 use std::{
-    io::Write,
     thread::{self, JoinHandle},
     time::Instant,
 };

crates/media/src/filters/video.rs

@@ -1,4 +1,4 @@
-use ffmpeg::{filter, format::pixel::Pixel};
+use ffmpeg::filter;
 
 use crate::{
     data::{FFVideo, VideoInfo},

crates/project/src/configuration.rs

@@ -1,3 +1,5 @@
+use std::ops::{Add, Div, Mul, Sub};
+
 use serde::{Deserialize, Serialize};
 use specta::Type;
 
@@ -46,14 +48,93 @@ impl Default for BackgroundSource {
     }
 }
 
-#[derive(Type, Serialize, Deserialize, Clone, Debug, Default)]
+#[derive(Type, Serialize, Deserialize, Clone, Copy, Debug, Default)]
 #[serde(rename_all = "camelCase")]
 pub struct XY<T> {
     pub x: T,
     pub y: T,
 }
 
-#[derive(Type, Serialize, Deserialize, Clone, Debug, Default)]
+impl<T> XY<T> {
+    pub fn new(x: T, y: T) -> Self {
+        Self { x, y }
+    }
+
+    pub fn map<U, F: Fn(T) -> U>(self, f: F) -> XY<U> {
+        XY {
+            x: f(self.x),
+            y: f(self.y),
+        }
+    }
+}
+
+impl<T: Add<Output = T>> Add for XY<T> {
+    type Output = Self;
+
+    fn add(self, other: Self) -> Self {
+        Self {
+            x: self.x + other.x,
+            y: self.y + other.y,
+        }
+    }
+}
+
+impl<T: Sub<Output = T>> Sub for XY<T> {
+    type Output = Self;
+
+    fn sub(self, other: Self) -> Self {
+        Self {
+            x: self.x - other.x,
+            y: self.y - other.y,
+        }
+    }
+}
+
+impl<T: Sub<Output = T> + Copy> Sub<T> for XY<T> {
+    type Output = Self;
+
+    fn sub(self, other: T) -> Self {
+        Self {
+            x: self.x - other,
+            y: self.y - other,
+        }
+    }
+}
+
+impl<T: Mul<Output = T> + Copy> Mul<T> for XY<T> {
+    type Output = Self;
+
+    fn mul(self, other: T) -> Self {
+        Self {
+            x: self.x * other,
+            y: self.y * other,
+        }
+    }
+}
+
+impl<T: Mul<Output = T> + Copy> Mul<XY<T>> for XY<T> {
+    type Output = Self;
+
+    fn mul(self, other: Self) -> Self {
+        Self {
+            x: self.x * other.x,
+            y: self.y * other.y,
+        }
+    }
+}
+
+impl<T: Div<Output = T> + Copy> Div<T> for XY<T> {
+    type Output = Self;
+
+    fn div(self, other: T) -> Self {
+        Self {
+            x: self.x / other,
+            y: self.y / other,
+        }
+    }
+}
+
+#[derive(Type, Serialize, Deserialize, Clone, Copy, Debug, Default)]
 #[serde(rename_all = "camelCase")]
 pub struct Crop {
     pub position: XY<u32>,
@@ -71,8 +152,8 @@ impl Crop {
 pub struct BackgroundConfiguration {
     pub source: BackgroundSource,
     pub blur: u32,
-    pub padding: f32,
-    pub rounding: f32,
+    pub padding: f64,
+    pub rounding: f64,
     pub inset: u32,
     pub crop: Option<Crop>,
 }