From 24efe741623b3d07967467593156fb59accf5de5 Mon Sep 17 00:00:00 2001
From: Flemmli97 <34157027+Flemmli97@users.noreply.github.com>
Date: Thu, 2 Jan 2025 15:00:37 +0100
Subject: [PATCH 1/2] fix(settings): fix video test and constraint (#971)

---
 src/lib/components/settings/VideoTest.svelte | 19 ++++---------------
 src/routes/settings/audio_video/+page.svelte |  2 +-
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/lib/components/settings/VideoTest.svelte b/src/lib/components/settings/VideoTest.svelte
index b8aadcf13..82ead20aa 100644
--- a/src/lib/components/settings/VideoTest.svelte
+++ b/src/lib/components/settings/VideoTest.svelte
@@ -6,17 +6,9 @@
     import { _ } from "svelte-i18n"
     import { get } from "svelte/store"
 
-    export let audioInput: string | undefined
-    export let videoInput: string | undefined
-
     let video: HTMLVideoElement
     let stream: MediaStream
 
-    Store.state.devices.video.subscribe(d => {
-        videoInput = d
-        switchCamera(videoInput)
-    })
-
     async function switchCamera(selectedVideoDeviceId: string) {
         try {
             if (stream) {
@@ -35,13 +27,10 @@
     }
 
     async function startVideoTest() {
-        videoInput = get(Store.state.devices.video)
-        const constraints = {
-            audio: {
-                deviceId: audioInput ? { exact: audioInput } : undefined,
-            },
+        let videoInput = get(Store.state.devices.video)
+        const constraints: MediaStreamConstraints = {
             video: {
-                deviceId: videoInput ? { exact: videoInput } : undefined,
+                deviceId: videoInput && videoInput !== "default" ? { exact: videoInput } : undefined,
             },
         }
 
@@ -60,7 +49,7 @@
             video.srcObject = stream
             video.play()
         } catch (err) {
-            console.error("Accessing the microphone failed:", err)
+            console.error("Accessing the camera failed:", err)
         }
     }
 
diff --git a/src/routes/settings/audio_video/+page.svelte b/src/routes/settings/audio_video/+page.svelte
index 6919d3a55..6d5b90be6 100644
--- a/src/routes/settings/audio_video/+page.svelte
+++ b/src/routes/settings/audio_video/+page.svelte
@@ -185,7 +185,7 @@
             }} />
     </SettingSection>
     <div class="flex-row">
-        <VideoTest audioInput={selectedInput} videoInput={undefined} />
+        <VideoTest />
     </div>
 
     <SettingSection hook="section-echo-cancellation" name={$_("settings.audio.echoCancellation")} description={$_("settings.audio.echoCancellationDescription")}>

From 46ca18cf7c64853b35ac33bbace9d55e086546a4 Mon Sep 17 00:00:00 2001
From: Flemmli97 <34157027+Flemmli97@users.noreply.github.com>
Date: Thu, 2 Jan 2025 15:01:44 +0100
Subject: [PATCH 2/2] fix(macos): camera/mic permission on macos build (#972)

---
 src-tauri/Info.plist | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 src-tauri/Info.plist

diff --git a/src-tauri/Info.plist b/src-tauri/Info.plist
new file mode 100644
index 000000000..7026b9f81
--- /dev/null
+++ b/src-tauri/Info.plist
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>NSMicrophoneUsageDescription</key>
+    <string>Request Microphone for Calling</string>
+    <key>NSMicrophoneUsageDescription</key>
+    <string>Request Microphone for Calling</string>
+    <key>NSCameraUsageDescription</key>
+    <string>Request Camera for Calling</string>
+</dict>
+</plist>
\ No newline at end of file