Skip to content
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

Dual output #4575

Merged
merged 370 commits into from
Aug 23, 2023
Merged

Dual output #4575

merged 370 commits into from
Aug 23, 2023

Conversation

michelinewu
Copy link
Contributor

No description provided.

…ource selector to correctly display scene item node toggles. Create or assign vertical scene nodes when collection initialized.
…splay, it does not set the second stream. When multistreaming vertical display, attempts to start the stream before the previous one has completed.
michelinewu and others added 28 commits July 5, 2023 18:05
* Toggle dual output when logging in via dual output login prompt.

* Unsubscribe from login subscription.
…4616)

* Ensure Edit Transform only accepts selections from a single display

* Get display for edit transform from click handler.

* Call cleanup function on unmount.

* Revert previous commit.

---------

Co-authored-by: Micheline Wu <69046953+michelinewu@users.noreply.github.com>
* Video fps settings apply to both displays.

* Remove async from functions.

* Remove promise resolution returns and add video prop to Trovo start stream options.
…4623)

* Isolate transformation editor commands to source within one display.

WIP: isolate drag on display.

WIP: Restore single drag handler.

WIP: Drag works.

WIP: isolate drag on display.

Isolate transformation editor commands to sources within one display.

Fix scale and crop editor commands.

Highlight source selector row when working with items in vertical display.

WIP: Restore single drag handler.

WIP: Drag works.

* Prevent user from dragging sources outside of canvas in dual output mode.

* WIP: calc drag boundary.

* Create drag boundaries.
* For dual output scenes, remove both nodes.

* Remove unused scenes event.

* Add timeouts between events in scenes events tests.
* WIP: Restores node map on second restart.

* WIP: node map loads to state and assigns scene item contexts on load. Source selector not filtering vertical nodes.

* Remove unnecessary call to obs to set video context. Context already set when loading scene item attributes.

* WIP: source selector state update.

* Add mutation to state service for when scene node map is set on load.

* Code cleanup and filter source selector nodes by display property.

* Fix error when switching scenes and scene collections.

* Add default display to node model when adding sources.

* Code review fixes.

* Add sceneNodeMaps guard clause

* Fix tests

* Fix guard clause

* Remove unnecessary change

---------

Co-authored-by: Sean Beyer <sean.beyer@streamlabs.com>
…s. Remove unuser imports in apps sources service. (#4645)
* Fix to use delete key shortcut in dual output mode.

* Fix remove source with delete key.
* Prevent toggle dual output mode with selective recording on. Remove dual output nodes from selection when toggling on selective recording.

* WIP: Selective recording fix.

* New osn version and hide projector context menu item if not working with horizontal scene item.

* Fix vertical display logic when toggling dual output with selective recording active.

* Error messages for selective recording in dual output mode.

* Add missing strings to translations.

* Remove logs and commented code.

* Selective recording stays on in dual output mode after app restart.
* Create recursion to render scene sources in dual output mode

* Fix strict null check

* Fix more cases where scene sources are rendered

* Fix infinite load
* Code cleanup.

* Fix drag and drop source from file system to editor display.

* WIP: investigate remove item and create item editor commands.

* Revert

* Fix for repeated undo/redo calls.

* Fix strict nulls and addFile tests.
* Update stream settings tabs to allow non ultra users to add one custom destination.

* Fix logic for ultra required error.
* Temporarily disable optimizer.

* Skip auto-config in onboarding test.

* Temporarily remove optimize step from onboarding flow and tests.
* Error message for toggling dual output with selective recording.

* Removed unused property.

* Update error message copy.
@michelinewu michelinewu merged commit 5e3cd16 into staging Aug 23, 2023
12 checks passed
@michelinewu michelinewu deleted the dual-output branch August 23, 2023 20:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants