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

service/mpris: improve compatibility with noncompliant players

Browse source
This commit is contained in:
outfoxxed 2024-05-23 18:15:49 -07:00
parent 5016dbf0d4
commit 06240ccf80
Signed by untrusted user: outfoxxed
GPG key ID: 4C88A185FB89301E
2 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -192,15 +192,15 @@ void MprisPlayer::setPosition(qreal position) {
}
auto target = static_cast<qlonglong>(position * 1000) * 1000;
this->pPosition.set(target);
if (!this->mTrackId.isEmpty()) {
this->player->SetPosition(QDBusObjectPath(this->mTrackId), target);
return;
} else {
auto pos = this->positionMs() * 1000;
this->player->Seek(target - pos);
}
this->pPosition.set(target);
}
void MprisPlayer::onPositionChanged() {
@ -247,6 +247,8 @@ void MprisPlayer::setVolume(qreal volume) {
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>()) {
@ -258,20 +260,34 @@ void MprisPlayer::onMetadataChanged() {
emit this->lengthChanged();
}
auto trackChanged = false;
auto trackidVariant = this->pMetadata.get().value("mpris:trackid");
if (trackidVariant.isValid() && trackidVariant.canConvert<QString>()) {
auto trackId = trackidVariant.value<QString>();
if (trackId != this->mTrackId) {
this->mTrackId = trackId;
trackChanged = true;
}
}
// Helps to catch players without trackid.
auto urlVariant = this->pMetadata.get().value("xesam:url");
if (urlVariant.isValid() && urlVariant.canConvert<QString>()) {
auto url = urlVariant.value<QString>();
if (url != this->mUrl) {
this->mUrl = url;
trackChanged = true;
}
}
if (trackChanged) {
// Some players don't seem to send position updates or seeks on track change.
this->pPosition.update();
emit this->trackChanged();
}
// Some players don't seem to send position updats or seeks on track change.
this->pPosition.update();
}
emit this->metadataChanged();
}
MprisPlaybackState::Enum MprisPlayer::playbackState() const { return this->mPlaybackState; }

1
src/services/mpris/player.hpp
View file

@ -326,6 +326,7 @@ private:
DBusMprisPlayerApp* app = nullptr;
DBusMprisPlayer* player = nullptr;
QString mTrackId;
QString mUrl;
};
} // namespace qs::service::mpris