Repository navigation
feat(desktop): recording settings menu with mid-recording microphone and camera switching #4262
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
richiemcilroy
wants to merge
21
commits into
main
Choose a base branch
from
feat/gpui-recording-settings-menu
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+2,356
−80
Open
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
9665f85
feat(recording): switch the microphone or camera mid-recording from t…
richiemcilroy f5289cb
test(recording): keep the switched mic test clear of the stereo downmix
richiemcilroy b83d989
style: rustfmt
richiemcilroy 5111f53
fix(desktop): build the input switch against the async app update
richiemcilroy 99f628a
test(desktop): debug deeplink to switch the recording microphone
richiemcilroy 8b81ccd
test(recording): av-sync-record can record a mic and switch it mid-re…
richiemcilroy 33123e6
fix(recording): build the microphone switch on Windows and keep clipp…
richiemcilroy 28d6021
fix(desktop): keep switching and pausing exclusive, size the Linux ba…
richiemcilroy 20af7a1
chore(desktop): drop an unused switch error dismissal
richiemcilroy b3a7adf
fix(desktop): restart with the switched inputs and keep the Linux bar…
richiemcilroy 348c73b
fix(desktop): size the Linux settings panel from the room below the bar
richiemcilroy 6e7682f
test(linux): find the wider recording bar in the desktop harness
richiemcilroy 688f491
Merge remote-tracking branch 'origin/main' into feat/gpui-recording-s…
richiemcilroy 3bcd343
fix(desktop): keep the Instant camera until the new one opens
richiemcilroy f324b37
fix(desktop): reopen a hidden Linux camera preview after recording
richiemcilroy 1251521
fix(recording): keep audio in place across an Instant microphone switch
richiemcilroy f49a886
test(recording): feed the switch timeline test in real time
richiemcilroy 0253920
fix(desktop): leave the camera alone when Stop lands during a switch
richiemcilroy b2729ab
fix(desktop): reopen a hidden camera preview after a clean capture ends
richiemcilroy bb37a1e
test(desktop): pin that Stop ends a pending camera switch
richiemcilroy e78a6b1
Merge remote-tracking branch 'origin/main' into feat/gpui-recording-s…
richiemcilroy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hidden camera preview stays closed after a Wayland clean capture ends
Medium Severity
On Linux under Wayland, a Display or Area clean capture (clean_capture_supported accepts those targets regardless of wayland) is started with the bar's Show camera preview turned off, so camera_preview_hidden is true and the bubble is closed. When the recording stops, the Idle observer runs restore_clean_capture_ui at app_windows.rs:648; for a lease with wayland set it calls begin_retained_capture_restore and returns false, so the early return skips the reopen at lines 651-653. The asynchronous completion in begin_retained_capture_restore (the Ok arm that takes the clean_capture lease) only calls update_camera_presentation(true), which returns with no camera window, and it never calls set_camera_preview_shown. The retained set for Wayland holds only the main window (app_windows.rs:3718-3722), so nothing else reopens the bubble. camera_preview_hidden therefore stays true and the toggle reads off until the user re-enables it. The new comment's claim that the hidden preview reopens after the lease is released does not hold on Wayland. Before this head the flag was cleared and the bubble also stayed closed, so this is an incomplete fix of the same path rather than a new regression. Fix: in the Wayland completion, after the lease is taken, call set_camera_preview_shown(true, cx) when camera_preview_hidden is set, as the observer does on X11. Verified by static trace only; no run was performed.