poz/quickshell
1
0
Fork 0
forked from quickshell/quickshell
Code Pull requests Activity

service/mpris: clarify trackinfo emit order and use QBindings

Browse source
This commit is contained in:
outfoxxed 2024-11-20 00:52:47 -08:00
parent 8450543e09
commit dca75b7d6a
Signed by untrusted user: outfoxxed
GPG key ID: 4C88A185FB89301E
5 changed files with 86 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

69
src/services/mpris/player.cpp
View file

@ -7,6 +7,7 @@
#include <qlogging.h>
#include <qloggingcategory.h>
#include <qobject.h>
#include <qproperty.h>
#include <qstring.h>
#include <qtmetamacros.h>
#include <qtypes.h>
@ -256,19 +257,13 @@ void MprisPlayer::setVolume(qreal volume) {
this->pVolume.write();
}
const QVariantMap& MprisPlayer::metadata() const { return this->pMetadata.get(); }
void MprisPlayer::onMetadataChanged() {
emit this->metadataChanged();
auto lengthVariant = this->pMetadata.get().value("mpris:length");
qlonglong length = -1;
if (lengthVariant.isValid() && lengthVariant.canConvert<qlonglong>()) {
length = lengthVariant.value<qlonglong>();
}
auto lengthChanged = this->setLength(length);
auto trackChanged = false;
QString trackId;
@ -297,47 +292,43 @@ void MprisPlayer::onMetadataChanged() {
}
}
auto trackTitle = this->pMetadata.get().value("xesam:title").toString();
auto trackTitleChanged = this->setTrackTitle(trackTitle.isNull() ? "Unknown Track" : trackTitle);
auto trackArtists = this->pMetadata.get().value("xesam:artist").value<QVector<QString>>();
auto trackArtistsChanged = this->setTrackArtists(trackArtists.join(", "));
auto trackAlbum = this->pMetadata.get().value("xesam:album").toString();
auto trackAlbumChanged = this->setTrackAlbum(trackAlbum.isNull() ? "Unknown Album" : trackAlbum);
auto trackAlbumArtist = this->pMetadata.get().value("xesam:albumArtist").toString();
auto trackAlbumArtistChanged = this->setTrackAlbumArtist(trackAlbumArtist);
auto trackArtUrl = this->pMetadata.get().value("mpris:artUrl").toString();
auto trackArtUrlChanged = this->setTrackArtUrl(trackArtUrl);
if (trackChanged) {
this->mUniqueId++;
// Some players don't seem to send position updates or seeks on track change.
this->pPosition.update();
emit this->trackChanged();
}
DropEmitter::call(
trackTitleChanged,
trackArtistsChanged,
trackAlbumChanged,
trackAlbumArtistChanged,
trackArtUrlChanged,
lengthChanged
);
Qt::beginPropertyUpdateGroup();
this->bMetadata = this->pMetadata.get();
auto trackTitle = this->pMetadata.get().value("xesam:title").toString();
this->bTrackTitle = trackTitle.isNull() ? "Unknown Track" : trackTitle;
auto trackArtist = this->pMetadata.get().value("xesam:artist").value<QVector<QString>>();
this->bTrackArtist = trackArtist.join(", ");
auto trackAlbum = this->pMetadata.get().value("xesam:album").toString();
this->bTrackAlbum = trackAlbum.isNull() ? "Unknown Album" : trackAlbum;
this->bTrackAlbumArtist = this->pMetadata.get().value("xesam:albumArtist").toString();
this->bTrackArtUrl = this->pMetadata.get().value("mpris:artUrl").toString();
if (trackChanged) {
emit this->trackChanged();
this->bUniqueId = this->bUniqueId + 1;
// Some players don't seem to send position updates or seeks on track change.
this->pPosition.update();
}
Qt::endPropertyUpdateGroup();
this->setLength(length);
emit this->postTrackChanged();
}
DEFINE_MEMBER_GET(MprisPlayer, uniqueId);
DEFINE_MEMBER_SET(MprisPlayer, length, setLength);
DEFINE_MEMBER_GETSET(MprisPlayer, trackTitle, setTrackTitle);
DEFINE_MEMBER_GETSET(MprisPlayer, trackArtists, setTrackArtists);
DEFINE_MEMBER_GETSET(MprisPlayer, trackAlbum, setTrackAlbum);
DEFINE_MEMBER_GETSET(MprisPlayer, trackAlbumArtist, setTrackAlbumArtist);
DEFINE_MEMBER_GETSET(MprisPlayer, trackArtUrl, setTrackArtUrl);
MprisPlaybackState::Enum MprisPlayer::playbackState() const { return this->mPlaybackState; }
void MprisPlayer::setPlaybackState(MprisPlaybackState::Enum playbackState) {