frontend: Avoid using Monitor Only in the UI#13589
Merged
Merged
Conversation
Member
|
Reusing the unassigned audio track warning for this feels a bit weird, won't the user will get a dialog about unassigned sources if they click it? If it's becoming a generic "something is wrong with your audio" icon then the variable names and behavior should change too. |
PatTheMav
reviewed
Jun 26, 2026
3bb3fab to
f1dce8f
Compare
f1dce8f to
0cbe29e
Compare
Member
Author
No, it doesn't trigger the warning dialog. Just applies the icon.
Done. |
PatTheMav
approved these changes
Jun 30, 2026
RytoEX
approved these changes
Jun 30, 2026
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
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
Removes Monitor Only from the list of monitoring options in the Advanced Audio Properties window and avoids setting it when changing mute/monitor settings via the UI.
Shows a warning icon when a source is unmuted but set to Monitor Only.
Note
This PR intentionally does not remove Monitor Only internally or change handling of it. This will be done in a later breaking release.
Motivation and Context
The Audio Mixer refactor in #12735 added a toggle button for controlling audio monitoring. This behaved as a pseudo tri state, setting monitoring to either
OBS_MONITORING_TYPE_MONITOR_ONLYorOBS_MONITORING_TYPE_MONITOR_AND_OUTPUTdepending on the muted state of the source.This led to some state desync issues when controlling mute state via plugins or websocket, as the UI was the only thing aware of this handling. #13378 adjusted the behaviour to be handled within libobs itself so that audio monitoring was entirely dependent on the state of the sources monitoring setting itself.
However this NOW leads to the UI exposing a previously confusing state:
A source set to monitor only will never output to stream/recordings, regardless of the muted state of that source. In past versions, the UI would reflect the muted/unmuted state. We have essentially "fixed" this so the mute icon reflects whether the source is going to output but it is now confusing to use a hotkey or websockets to toggle mute state, and have nothing happen in the mixer.
With the changes to the UI and monitoring behaviour itself, the monitoring enum no longer makes sense. It will be deprecated/removed in a future version and replaced with a monitoring on/off boolean.
In the interim, this PR avoids setting Monitor Only via the UI as it is now an obsolete setting and will use the existing warning icon when an unmuted source is set to monitor only.
Any interaction via the UI will resolve this.
How Has This Been Tested?
Toggled the mute state of sources via websockets. Ensured that untouched sources did not have their state changed and that anything set to Monitor Only remained as such in older versions.
Types of changes
Checklist: