changes from main

This commit is contained in:
end-4
2026-02-20 22:56:59 +01:00
parent 6f5ab232a6
commit 368df5b717
6 changed files with 39 additions and 27 deletions
@@ -25,22 +25,16 @@ Singleton {
property var activeTrack;
property bool hasPlasmaIntegration: false
Process {
id: plasmaIntegrationAvailabilityCheckProc
running: true
command: ["bash", "-c", "command -v plasma-browser-integration-host"]
onExited: (exitCode, exitStatus) => {
root.hasPlasmaIntegration = (exitCode === 0);
}
}
readonly property bool hasActivePlasmaIntegration: Mpris.players.values.some(
p => p.dbusName?.startsWith('org.mpris.MediaPlayer2.plasma-browser-integration')
)
function isRealPlayer(player) {
if (!Config.options.media.filterDuplicatePlayers) {
return true;
}
return (
// Remove unecessary native buses from browsers if there's plasma integration
!(hasPlasmaIntegration && player.dbusName.startsWith('org.mpris.MediaPlayer2.firefox')) && !(hasPlasmaIntegration && player.dbusName.startsWith('org.mpris.MediaPlayer2.chromium')) &&
// Remove native browser buses only if plasma-browser-integration is actually active on D-Bus
!(hasActivePlasmaIntegration && player.dbusName.startsWith('org.mpris.MediaPlayer2.firefox')) && !(hasActivePlasmaIntegration && player.dbusName.startsWith('org.mpris.MediaPlayer2.chromium')) &&
// playerctld just copies other buses and we don't need duplicates
!player.dbusName?.startsWith('org.mpris.MediaPlayer2.playerctld') &&
// Non-instance mpd bus