Merge branch 'dev' into empty-scrollbar-fix

Satellite-im · Jan 2, 2025 · 213c712 · 213c712
2 parents 28682c5 + 46ca18c
commit 213c712
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/src-tauri/Info.plist 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>
diff --git 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
@@ -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")}>