UI: Fix a bug with Output Settings not updating & Toggle audio multi-tracks correctly #10294
Conversation
This file contains 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 removes the LoadOutputSettings() called in SaveStream1Settings. It caused a bug when trying to save Output settings when both Stream and Output settings have been changed but the changes have not been applied by hitting the 'Apply' button in Settings. Signed-off-by: pkv <pkv@obsproject.com>
pkviet
added
Bug Fix
RytoEX
changed the title
pkviet
force-pushed
the
ui_stream_fix
branch
2 times, most recently
from
5bd04d3
to
33aa419
Compare
|
Putting this to Draft. Will fix the CI issues later today |
tytan652
reviewed
Feb 27, 2024
pkviet
force-pushed
the
ui_stream_fix
branch
from
33aa419
to
f594724
Compare
tytan652
reviewed
Feb 27, 2024
pkviet
force-pushed
the
ui_stream_fix
branch
from
f594724
to
0dc09bd
Compare
thanks, done. |
derrod
approved these changes
Feb 27, 2024
pkviet
force-pushed
the
ui_stream_fix
branch
from
0dc09bd
to
414e0d3
Compare
RytoEX
requested changes
Feb 27, 2024
This toggles audio multi track display in Output settings when: 1. When there is a signal that a stream service is changed to a non custom one. Indeed multi-track audio is only available with Custom service and only with SRT or RIST protocols. 2. When a Custom service is picked, and SRT or RIST are detected in the server URL. 3. When Stream settings are saved when one hits Apply. This is in addition to the toggling done when loading Stream Settings. Signed-off-by: pkv <pkv@obsproject.com>
pkviet
force-pushed
the
ui_stream_fix
branch
from
414e0d3
to
63e7640
Compare
RytoEX
approved these changes
Feb 27, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
This does two things:
Credits: Rodney made the correct guess for the faulty line.
(mpegts). The LoadOutputSettings call was used to do that update but it was too broad. Instead we use (a) the signal when a service is changed to switch back from mpegts multi-track to single track; (b) the signal when a URL is input in the Server text field of Custom service; (c) when Stream settings are saved.
Motivation and Context
Fixes a bug found in 30.1 beta.
The function was introduced by me in #9028 .
It was used to toggle the display of audio multi-tracks checkboxes instead of radio buttons.
The repro steps in beta are as follows:
The reason why this occurs is because when one hits apply, the stream settings are saved before the output settings.
But since they load the output settings, the changes for the outputs are reverted.
But we still want to display correctly audio multi track buttons (either radio or checkboxes). This is the goal of the second commit.
How Has This Been Tested?
The bug is fixed.
SRT multi-track audio still works (tested from obs to wowza).
Multi-track buttons alternate correctly between radio or checkboxes as a function of the Service or as a function of the protocol when Custom service is picked.
Types of changes
Checklist: