Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-10-16 16:24:00 -04:00
Code Packages Releases Activity

audio: resolve the sound theme before the login sound plays

Browse Source 
fixes #3290
port 1.6

(cherry picked from commit 936b42b4e7)
This commit is contained in:
bbedward
2026-09-04 16:02:51 +00:00
committed by dms-ci[bot]
parent acca7fae68
commit 8371fa8ef5
1 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickshell/Services/AudioService.qml
+33 -14
View File
@@ -20,6 +20,8 @@ Singleton {
readonly property bool soundsAvailable: MultimediaService.available
property bool playersRequested: false
property bool soundThemeSupported: false
property bool soundThemeResolved: false
property bool loginSoundPending: false
property var availableSoundThemes: []
property string currentSoundTheme: ""
property var soundFilePaths: ({})
@@ -549,10 +551,12 @@ EOFCONFIG
function checkSoundThemeSupport() {
Proc.runCommand("checkSoundThemeSupport", ["sh", "-c", GSettings.getCmd("org.gnome.desktop.sound", "theme-name")], (output, exitCode) => {
soundThemeSupported = (output || "").trim().length > 0;
if (soundThemeSupported) {
scanSoundThemes();
getCurrentSoundTheme();
if (!soundThemeSupported) {
markSoundThemeResolved();
return;
}
scanSoundThemes();
getCurrentSoundTheme();
}, 0);
}
@@ -583,16 +587,13 @@ EOFCONFIG
function getCurrentSoundTheme() {
Proc.runCommand("getCurrentSoundTheme", ["sh", "-c", GSettings.getCmd("org.gnome.desktop.sound", "theme-name")], (output, exitCode) => {
if (output.trim()) {
currentSoundTheme = output.trim();
log.debug("Current system sound theme:", currentSoundTheme);
if (SettingsData.useSystemSoundTheme) {
discoverSoundFiles(currentSoundTheme);
}
} else {
currentSoundTheme = "";
log.debug("No system sound theme found");
currentSoundTheme = output.trim();
log.debug("Current system sound theme:", currentSoundTheme || "none");
if (currentSoundTheme && SettingsData.useSystemSoundTheme) {
discoverSoundFiles(currentSoundTheme);
return;
}
markSoundThemeResolved();
}, 0);
}
@@ -614,6 +615,7 @@ EOFCONFIG
function discoverSoundFiles(themeName) {
if (!themeName) {
soundFilePaths = {};
markSoundThemeResolved();
return;
}
@@ -670,9 +672,18 @@ EOFCONFIG
}
}
soundFilePaths = paths;
markSoundThemeResolved();
}, 0);
}
function markSoundThemeResolved() {
soundThemeResolved = true;
if (!loginSoundPending)
return;
loginSoundPending = false;
playLoginSound();
}
function getSoundPath(soundEvent) {
const soundMap = {
"audio-volume-change": "../assets/sounds/freedesktop/audio-volume-change.wav",
@@ -708,9 +719,10 @@ EOFCONFIG
log.debug("Reloading sounds, useSystemSoundTheme:", SettingsData.useSystemSoundTheme, "currentSoundTheme:", currentSoundTheme);
if (SettingsData.useSystemSoundTheme && currentSoundTheme) {
discoverSoundFiles(currentSoundTheme);
} else {
soundFilePaths = {};
return;
}
soundFilePaths = {};
markSoundThemeResolved();
}
function isMediaPlaying() {
@@ -765,6 +777,11 @@ EOFCONFIG
function playLoginSound() {
ensurePlayers();
// playing before the theme paths land swaps the player source mid-playback, which stops it
if (SettingsData.useSystemSoundTheme && !soundThemeResolved) {
loginSoundPending = true;
return;
}
if (!soundsAvailable || !loginSound || notificationsAudioMuted || shouldMuteForMedia()) {
return;
}
@@ -1178,5 +1195,7 @@ EOFCONFIG
Component.onCompleted: {
rebuildTypedNodeLists();
loadDeviceAliases();
if (SettingsData.soundsEnabled && SettingsData.useSystemSoundTheme)
getCurrentSoundTheme();
}
}