From 04d36e09b9af815495692048dc994bd51ec705a8 Mon Sep 17 00:00:00 2001 From: Warchamp7 Date: Tue, 23 Jun 2026 19:04:33 -0400 Subject: [PATCH] frontend: Remove Monitor Only from UI --- frontend/components/OBSAdvAudioCtrl.cpp | 3 +-- frontend/components/VolumeControl.cpp | 20 +++++--------------- frontend/data/locale/en-US.ini | 2 +- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/frontend/components/OBSAdvAudioCtrl.cpp b/frontend/components/OBSAdvAudioCtrl.cpp index 2f3766f4e..61bc455d5 100644 --- a/frontend/components/OBSAdvAudioCtrl.cpp +++ b/frontend/components/OBSAdvAudioCtrl.cpp @@ -155,10 +155,9 @@ OBSAdvAudioCtrl::OBSAdvAudioCtrl(QGridLayout *, obs_source_t *source_) : source( int idx; if (obs_audio_monitoring_available()) { monitoringType->addItem(QTStr("Basic.AdvAudio.Monitoring.None"), (int)OBS_MONITORING_TYPE_NONE); - monitoringType->addItem(QTStr("Basic.AdvAudio.Monitoring.MonitorOnly"), - (int)OBS_MONITORING_TYPE_MONITOR_ONLY); monitoringType->addItem(QTStr("Basic.AdvAudio.Monitoring.Both"), (int)OBS_MONITORING_TYPE_MONITOR_AND_OUTPUT); + monitoringType->setPlaceholderText(QTStr("Basic.AdvAudio.Monitoring.MonitorOnly")); int mt = (int)obs_source_get_monitoring_type(source); idx = monitoringType->findData(mt); monitoringType->setCurrentIndex(idx); diff --git a/frontend/components/VolumeControl.cpp b/frontend/components/VolumeControl.cpp index 57a881df7..0e827d87d 100644 --- a/frontend/components/VolumeControl.cpp +++ b/frontend/components/VolumeControl.cpp @@ -818,27 +818,17 @@ void VolumeControl::handleMuteButton(bool mute) { setMuted(mute); - if (obsMonitoringType != OBS_MONITORING_TYPE_NONE) { - if (mute) { - setMonitoring(OBS_MONITORING_TYPE_MONITOR_ONLY); - } else { - setMonitoring(OBS_MONITORING_TYPE_MONITOR_AND_OUTPUT); - } + if (!mute && obsMonitoringType == OBS_MONITORING_TYPE_MONITOR_ONLY) { + setMonitoring(OBS_MONITORING_TYPE_MONITOR_AND_OUTPUT); } } void VolumeControl::handleMonitorButton(bool enableMonitoring) { - if (!enableMonitoring) { - setMonitoring(OBS_MONITORING_TYPE_NONE); - return; - } + obs_monitoring_type newType = (enableMonitoring) ? OBS_MONITORING_TYPE_MONITOR_AND_OUTPUT + : OBS_MONITORING_TYPE_NONE; - if (obsMuted) { - setMonitoring(OBS_MONITORING_TYPE_MONITOR_ONLY); - } else { - setMonitoring(OBS_MONITORING_TYPE_MONITOR_AND_OUTPUT); - } + setMonitoring(newType); } void VolumeControl::sliderChanged(int vol) diff --git a/frontend/data/locale/en-US.ini b/frontend/data/locale/en-US.ini index 51ea30b4a..c8a2d08ac 100644 --- a/frontend/data/locale/en-US.ini +++ b/frontend/data/locale/en-US.ini @@ -1387,7 +1387,7 @@ Basic.AdvAudio.SyncOffsetSource="Sync Offset for '%1'" Basic.AdvAudio.Monitoring="Audio Monitoring" Basic.AdvAudio.Monitoring.None="Monitor Off" Basic.AdvAudio.Monitoring.MonitorOnly="Monitor Only (mute output)" -Basic.AdvAudio.Monitoring.Both="Monitor and Output" +Basic.AdvAudio.Monitoring.Both="Monitoring Enabled" Basic.AdvAudio.MonitoringSource="Audio Monitoring for '%1'" Basic.AdvAudio.AudioTracks="Tracks"