diff options
| author | Craig Jennings <c@cjennings.net> | 2026-02-03 08:51:41 -0600 |
|---|---|---|
| committer | Craig Jennings <c@cjennings.net> | 2026-02-03 08:51:47 -0600 |
| commit | 35e5c10b64d7e842ee84d81c7b496cc3202091e8 (patch) | |
| tree | 64aa8652f118f56d65ea5fff11bf9c907218649e | |
| parent | 1683b3375e35827f487a3582dfae4f68128824f7 (diff) | |
fix(video-recording): use generic 'Built-in Audio' label
Renamed 'Built-in Laptop Audio' to 'Built-in Audio' since PCI audio
devices are used on both laptops and desktops.
4 files changed, 11 insertions, 11 deletions
diff --git a/modules/video-audio-recording.el b/modules/video-audio-recording.el index 5c9b7f40..e44f83c8 100644 --- a/modules/video-audio-recording.el +++ b/modules/video-audio-recording.el @@ -294,7 +294,7 @@ Returns alist of (device-name . (mic-source . monitor-source))." (cond ((string-match-p "usb.*[Jj]abra" base-name) "Jabra SPEAK 510 USB") ((string-match-p "^usb-" base-name) "USB Audio Device") - ((string-match-p "^pci-" base-name) "Built-in Laptop Audio") + ((string-match-p "^pci-" base-name) "Built-in Audio") ((string-match-p "^[0-9A-Fa-f:]+$" base-name) "Bluetooth Headset") (t base-name)))) (push (cons friendly-name pair) result)))) diff --git a/tests/test-integration-recording-device-workflow.el b/tests/test-integration-recording-device-workflow.el index ba92d700..3ef631f3 100644 --- a/tests/test-integration-recording-device-workflow.el +++ b/tests/test-integration-recording-device-workflow.el @@ -76,7 +76,7 @@ Validates: (should (= 3 (length grouped))) ;; Validate built-in device - (let ((built-in (assoc "Built-in Laptop Audio" grouped))) + (let ((built-in (assoc "Built-in Audio" grouped))) (should built-in) (should (string-prefix-p "alsa_input.pci" (cadr built-in))) (should (string-prefix-p "alsa_output.pci" (cddr built-in)))) @@ -160,7 +160,7 @@ Validates: ;; Group returns only 1 complete device (let ((grouped (cj/recording-group-devices-by-hardware))) (should (= 1 (length grouped))) - (should (equal "Built-in Laptop Audio" (caar grouped)))))))) + (should (equal "Built-in Audio" (caar grouped)))))))) ;;; Edge Cases - Bluetooth MAC Normalization diff --git a/tests/test-video-audio-recording-group-devices-by-hardware.el b/tests/test-video-audio-recording-group-devices-by-hardware.el index 0abe5f6c..2be4982f 100644 --- a/tests/test-video-audio-recording-group-devices-by-hardware.el +++ b/tests/test-video-audio-recording-group-devices-by-hardware.el @@ -43,7 +43,7 @@ This is the key test validating the complete grouping logic." (should (= 3 (length result))) ;; Check that we have all three device types (let ((names (mapcar #'car result))) - (should (member "Built-in Laptop Audio" names)) + (should (member "Built-in Audio" names)) (should (member "Bluetooth Headset" names)) (should (member "Jabra SPEAK 510 USB" names))) ;; Verify each device has both mic and monitor @@ -60,7 +60,7 @@ This is the key test validating the complete grouping logic." (cl-letf (((symbol-function 'shell-command-to-string) (lambda (_cmd) output))) (let* ((result (cj/recording-group-devices-by-hardware)) - (built-in (assoc "Built-in Laptop Audio" result))) + (built-in (assoc "Built-in Audio" result))) (should built-in) (should (string-match-p "pci-0000_00_1f" (cadr built-in))) (should (string-match-p "pci-0000_00_1f" (cddr built-in))) @@ -129,7 +129,7 @@ Devices must have BOTH mic and monitor to be included." (lambda (_cmd) output))) (let ((result (cj/recording-group-devices-by-hardware))) (should (= 1 (length result))) - (should (equal "Built-in Laptop Audio" (caar result))))))) + (should (equal "Built-in Audio" (caar result))))))) (ert-deftest test-video-audio-recording-group-devices-by-hardware-boundary-mixed-complete-incomplete () "Test that only devices with BOTH mic and monitor are included. @@ -147,7 +147,7 @@ Incomplete devices (only mic or only monitor) are filtered out." (let ((result (cj/recording-group-devices-by-hardware))) ;; Only the complete built-in device should be returned (should (= 1 (length result))) - (should (equal "Built-in Laptop Audio" (caar result))))))) + (should (equal "Built-in Audio" (caar result))))))) ;;; Error Cases diff --git a/tests/test-video-audio-recording-quick-setup-for-calls.el b/tests/test-video-audio-recording-quick-setup-for-calls.el index 0d3fe53a..70980ad4 100644 --- a/tests/test-video-audio-recording-quick-setup-for-calls.el +++ b/tests/test-video-audio-recording-quick-setup-for-calls.el @@ -48,7 +48,7 @@ (test-quick-setup-setup) (unwind-protect (let ((grouped-devices '(("Jabra SPEAK 510 USB" . ("usb-input" . "usb-monitor")) - ("Built-in Laptop Audio" . ("pci-input" . "pci-monitor")))) + ("Built-in Audio" . ("pci-input" . "pci-monitor")))) (presented-choices nil)) (cl-letf (((symbol-function 'cj/recording-group-devices-by-hardware) (lambda () grouped-devices)) @@ -58,7 +58,7 @@ (car choices)))) (cj/recording-quick-setup-for-calls) (should (member "Jabra SPEAK 510 USB" presented-choices)) - (should (member "Built-in Laptop Audio" presented-choices)))) + (should (member "Built-in Audio" presented-choices)))) (test-quick-setup-teardown))) (ert-deftest test-video-audio-recording-quick-setup-for-calls-normal-displays-confirmation () @@ -84,11 +84,11 @@ "Test that with single device, selection still happens." (test-quick-setup-setup) (unwind-protect - (let ((grouped-devices '(("Built-in Laptop Audio" . ("pci-input" . "pci-monitor"))))) + (let ((grouped-devices '(("Built-in Audio" . ("pci-input" . "pci-monitor"))))) (cl-letf (((symbol-function 'cj/recording-group-devices-by-hardware) (lambda () grouped-devices)) ((symbol-function 'completing-read) - (lambda (_prompt _choices &rest _args) "Built-in Laptop Audio"))) + (lambda (_prompt _choices &rest _args) "Built-in Audio"))) (cj/recording-quick-setup-for-calls) (should (equal "pci-input" cj/recording-mic-device)) (should (equal "pci-monitor" cj/recording-system-device)))) |
