vinzenz/nova-shell
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use Instantiator for mpris state watchers instead of manual createObject

Browse source
This commit is contained in:
Damocles 2026-04-18 13:34:04 +02:00
parent 0ca190a4a6
commit 1b6c2fee91
1 changed files with 13 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

44
shell/services/MprisService.qml
View file

@ -1,6 +1,7 @@
pragma Singleton pragma Singleton
import QtQuick import QtQuick
import QtQml.Models
import Quickshell.Services.Mpris import Quickshell.Services.Mpris
QtObject { QtObject {
@ -13,7 +14,6 @@ QtObject {
property string _selectedIdentity: "" property string _selectedIdentity: ""
property var _lastPlayedTime: ({}) property var _lastPlayedTime: ({})
property var _watchers: []
onPlayerChanged: { onPlayerChanged: {
if (player) if (player)
@ -33,33 +33,18 @@ QtObject {
} }
} }
// Watch raw Mpris.players for add/remove - this does NOT fire on state changes // Watch all raw players for state changes via Instantiator -
property Connections _mprisConn: Connections { // delegates persist across state changes since the model only
target: Mpris // changes on player add/remove, not property changes
function onPlayersChanged() { property Instantiator _stateWatchers: Instantiator {
root._reconnectWatchers(); model: Mpris.players
} delegate: QtObject {
} required property MprisPlayer modelData
property Connections _conn: Connections {
function _reconnectWatchers() { target: modelData
for (const w of _watchers) function onPlaybackStateChanged() {
w.destroy(); root._onPlaybackStateChanged(modelData);
}
const raw = Mpris.players.values ?? [];
const newWatchers = [];
for (const p of raw) {
const conn = _watcherComp.createObject(root, {
target: p
});
newWatchers.push(conn);
}
_watchers = newWatchers;
}
property Component _watcherComp: Component {
Connections {
function onPlaybackStateChanged() {
root._onPlaybackStateChanged(target);
} }
} }
} }
@ -84,7 +69,6 @@ QtObject {
} }
} }
} else if (p.playbackState === MprisPlaybackState.Paused && p === player) { } else if (p.playbackState === MprisPlaybackState.Paused && p === player) {
// Current player paused - switch to a playing one if available
_switchToPlaying(); _switchToPlaying();
} }
} }
@ -139,6 +123,4 @@ QtObject {
if (players[idx]) if (players[idx])
_selectedIdentity = players[idx].identity ?? ""; _selectedIdentity = players[idx].identity ?? "";
} }
Component.onCompleted: _reconnectWatchers()
} }