Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-08-07 05:58:28 -04:00
Code Packages Releases Activity

fix(AudioService): update the default audio sink device handling

Browse Source 
- Fixes #2764
This commit is contained in:
purian23
2026-07-07 20:17:40 -04:00
parent d799175c07
commit 1724aedd49
1 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickshell/Services/AudioService.qml
+22 -19
View File
@@ -841,13 +841,32 @@ EOFCONFIG
function setVolume(percentage) { function setVolume(percentage) {
if (!root.sink?.audio) if (!root.sink?.audio)
return "No audio sink available"; return "No audio sink available";
if (isNaN(percentage))
return "Invalid percentage";
const maxVol = root.sinkMaxVolume; const maxVol = root.sinkMaxVolume;
const clampedVolume = Math.max(0, Math.min(maxVol, percentage)); const clampedVolume = Math.max(0, Math.min(maxVol, percentage));
root.sink.audio.volume = clampedVolume / 100; Quickshell.execDetached(["wpctl", "set-volume", "-l", String(maxVol / 100), "@DEFAULT_AUDIO_SINK@", String(clampedVolume / 100)]);
return `Volume set to ${clampedVolume}%`; return `Volume set to ${clampedVolume}%`;
} }
function outputVolumeStep(step) {
const parsed = parseInt(step || "5");
return isNaN(parsed) ? 5 : Math.max(0, parsed);
}
function adjustDefaultSinkVolume(step, direction) {
const maxVol = root.sinkMaxVolume;
const stepValue = outputVolumeStep(step);
const currentVolume = Math.round(root.sink.audio.volume * 100);
const newVolume = Math.max(0, Math.min(maxVol, currentVolume + direction * stepValue));
const suffix = direction > 0 ? "+" : "-";
Quickshell.execDetached(["wpctl", "set-mute", "@DEFAULT_AUDIO_SINK@", "0"]);
Quickshell.execDetached(["wpctl", "set-volume", "-l", String(maxVol / 100), "@DEFAULT_AUDIO_SINK@", `${stepValue}%${suffix}`]);
return newVolume;
}
function toggleMute() { function toggleMute() {
if (!root.sink?.audio) { if (!root.sink?.audio) {
return "No audio sink available"; return "No audio sink available";
@@ -939,15 +958,7 @@ EOFCONFIG
if (!root.sink?.audio) if (!root.sink?.audio)
return "No audio sink available"; return "No audio sink available";
if (root.sink.audio.muted) const newVolume = root.adjustDefaultSinkVolume(step, 1);
root.sink.audio.muted = false;
const maxVol = root.sinkMaxVolume;
const currentVolume = Math.round(root.sink.audio.volume * 100);
const stepValue = parseInt(step || "5");
const newVolume = Math.max(0, Math.min(maxVol, currentVolume + stepValue));
root.sink.audio.volume = newVolume / 100;
return `Volume increased to ${newVolume}%`; return `Volume increased to ${newVolume}%`;
} }
@@ -955,15 +966,7 @@ EOFCONFIG
if (!root.sink?.audio) if (!root.sink?.audio)
return "No audio sink available"; return "No audio sink available";
if (root.sink.audio.muted) const newVolume = root.adjustDefaultSinkVolume(step, -1);
root.sink.audio.muted = false;
const maxVol = root.sinkMaxVolume;
const currentVolume = Math.round(root.sink.audio.volume * 100);
const stepValue = parseInt(step || "5");
const newVolume = Math.max(0, Math.min(maxVol, currentVolume - stepValue));
root.sink.audio.volume = newVolume / 100;
return `Volume decreased to ${newVolume}%`; return `Volume decreased to ${newVolume}%`;
} }