mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-08-01 19:18:28 -04:00
audio: only show mic volume OSD through DMS IPCs, not external source
changes fixes #2790 port 1.5
This commit is contained in:
@@ -255,6 +255,7 @@ BasePill {
|
||||
const newVolume = delta > 0 ? Math.min(100, currentVolume + step) : Math.max(0, currentVolume - step);
|
||||
AudioService.source.audio.muted = false;
|
||||
AudioService.source.audio.volume = newVolume / 100;
|
||||
AudioService.micVolumeChanged();
|
||||
}
|
||||
|
||||
function handleBrightnessWheel(delta) {
|
||||
|
||||
@@ -23,10 +23,10 @@ DankOSD {
|
||||
Connections {
|
||||
target: AudioService.source?.audio ?? null
|
||||
|
||||
// Sync only - apps adjusting mic gain (WebRTC AGC etc.) fire this
|
||||
// constantly, so external volume changes must not surface the OSD
|
||||
function onVolumeChanged() {
|
||||
root._syncVolume();
|
||||
if (SettingsData.osdMicVolumeEnabled)
|
||||
root.show();
|
||||
}
|
||||
|
||||
function onMutedChanged() {
|
||||
@@ -38,6 +38,12 @@ DankOSD {
|
||||
Connections {
|
||||
target: AudioService
|
||||
|
||||
function onMicVolumeChanged() {
|
||||
root._syncVolume();
|
||||
if (SettingsData.osdMicVolumeEnabled)
|
||||
root.show();
|
||||
}
|
||||
|
||||
function onSourceChanged() {
|
||||
root._syncVolume();
|
||||
if (root.shouldBeVisible && SettingsData.osdMicVolumeEnabled)
|
||||
|
||||
@@ -61,6 +61,7 @@ Singleton {
|
||||
readonly property int wheelVolumeStep: SettingsData.audioWheelScrollAmount
|
||||
|
||||
signal micMuteChanged
|
||||
signal micVolumeChanged
|
||||
signal audioOutputCycled(string deviceName, string deviceIcon)
|
||||
signal deviceAliasChanged(string nodeName, string newAlias)
|
||||
signal wireplumberReloadStarted
|
||||
@@ -905,6 +906,7 @@ EOFCONFIG
|
||||
|
||||
const clampedVolume = Math.max(0, Math.min(100, percentage));
|
||||
root.source.audio.volume = clampedVolume / 100;
|
||||
micVolumeChanged();
|
||||
return `Microphone volume set to ${clampedVolume}%`;
|
||||
}
|
||||
|
||||
@@ -929,6 +931,7 @@ EOFCONFIG
|
||||
const newVolume = Math.max(0, Math.min(100, currentVolume + stepValue));
|
||||
|
||||
root.source.audio.volume = newVolume / 100;
|
||||
micVolumeChanged();
|
||||
return `Microphone volume increased to ${newVolume}%`;
|
||||
}
|
||||
|
||||
@@ -944,6 +947,7 @@ EOFCONFIG
|
||||
const newVolume = Math.max(0, Math.min(100, currentVolume - stepValue));
|
||||
|
||||
root.source.audio.volume = newVolume / 100;
|
||||
micVolumeChanged();
|
||||
return `Microphone volume decreased to ${newVolume}%`;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user