tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add title, artist and album to MPRIS network packets

Browse source 
Summary: This diff adds the title, artist and album to the MPRIS network packets. That's useful when you need more detail than just "artist - title", for example in the future media control notification. It also fixes weird song descriptions for empty artist strings (e.g. Spotify uses an empty (but present) artist when playing ads)

Reviewers: #kde_connect, apol

Reviewed By: #kde_connect, apol

Subscribers: nicolasfella, apol

Differential Revision: https://phabricator.kde.org/D8957
This commit is contained in:
Matthijs Tijink 2017-11-22 19:13:15 +01:00
parent 7e7aa6df3f
commit 71d8eb07c3
2 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
plugins/mpriscontrol/mpriscontrolplugin.cpp
View file

@ -129,22 +129,9 @@ void MprisControlPlugin::propertiesChanged(const QString& propertyInterface, con
QDBusArgument bullshit = qvariant_cast<QDBusArgument>(properties[QStringLiteral("Metadata")]); QDBusArgument bullshit = qvariant_cast<QDBusArgument>(properties[QStringLiteral("Metadata")]);
QVariantMap nowPlayingMap; QVariantMap nowPlayingMap;
bullshit >> nowPlayingMap; bullshit >> nowPlayingMap;
if (nowPlayingMap.contains(QStringLiteral("xesam:title"))) {
QString nowPlaying = nowPlayingMap[QStringLiteral("xesam:title")].toString();
if (nowPlayingMap.contains(QStringLiteral("xesam:artist"))) {
nowPlaying = nowPlayingMap[QStringLiteral("xesam:artist")].toString() + " - " + nowPlaying;
}
np.set(QStringLiteral("nowPlaying"),nowPlaying);
somethingToSend = true;
}
if (nowPlayingMap.contains(QStringLiteral("mpris:length"))) {
if (nowPlayingMap.contains(QStringLiteral("mpris:length"))) {
long long length = nowPlayingMap[QStringLiteral("mpris:length")].toLongLong();
np.set(QStringLiteral("length"),length/1000); //milis to nanos
}
somethingToSend = true;
}
mprisPlayerMetadataToNetworkPackage(np, nowPlayingMap);
somethingToSend = true;
} }
if (properties.contains(QStringLiteral("PlaybackStatus"))) { if (properties.contains(QStringLiteral("PlaybackStatus"))) {
bool playing = (properties[QStringLiteral("PlaybackStatus")].toString() == QLatin1String("Playing")); bool playing = (properties[QStringLiteral("PlaybackStatus")].toString() == QLatin1String("Playing"));
@ -242,18 +229,9 @@ bool MprisControlPlugin::receivePackage (const NetworkPackage& np)
NetworkPackage answer(PACKAGE_TYPE_MPRIS); NetworkPackage answer(PACKAGE_TYPE_MPRIS);
bool somethingToSend = false; bool somethingToSend = false;
if (np.get<bool>(QStringLiteral("requestNowPlaying"))) { if (np.get<bool>(QStringLiteral("requestNowPlaying"))) {
QVariantMap nowPlayingMap = mprisInterface.metadata(); QVariantMap nowPlayingMap = mprisInterface.metadata();
QString nowPlaying = nowPlayingMap[QStringLiteral("xesam:title")].toString(); mprisPlayerMetadataToNetworkPackage(answer, nowPlayingMap);
if (nowPlayingMap.contains(QStringLiteral("xesam:artist"))) {
nowPlaying = nowPlayingMap[QStringLiteral("xesam:artist")].toString() + " - " + nowPlaying;
}
answer.set(QStringLiteral("nowPlaying"),nowPlaying);
if (nowPlayingMap.contains(QStringLiteral("mpris:length"))) {
qlonglong length = nowPlayingMap[QStringLiteral("mpris:length")].toLongLong();
answer.set(QStringLiteral("length"),length/1000);
}
qlonglong pos = mprisInterface.position(); qlonglong pos = mprisInterface.position();
answer.set(QStringLiteral("pos"), pos/1000); answer.set(QStringLiteral("pos"), pos/1000);
@ -288,4 +266,25 @@ void MprisControlPlugin::sendPlayerList()
sendPackage(np); sendPackage(np);
} }
void MprisControlPlugin::mprisPlayerMetadataToNetworkPackage(NetworkPackage& np, const QVariantMap& nowPlayingMap) const {
QString title = nowPlayingMap[QStringLiteral("xesam:title")].toString();
QString artist = nowPlayingMap[QStringLiteral("xesam:artist")].toString();
QString album = nowPlayingMap[QStringLiteral("xesam:album")].toString();
QString nowPlaying = title;
if (!artist.isEmpty()) {
nowPlaying = artist + " - " + title;
}
np.set(QStringLiteral("title"), title);
np.set(QStringLiteral("artist"), artist);
np.set(QStringLiteral("album"), album);
np.set(QStringLiteral("nowPlaying"), nowPlaying);
bool hasLength = false;
long long length = nowPlayingMap[QStringLiteral("mpris:length")].toLongLong(&hasLength) / 1000; //nanoseconds to milliseconds
if (!hasLength) {
length = -1;
}
np.set(QStringLiteral("length"), length);
}
#include "mpriscontrolplugin.moc" #include "mpriscontrolplugin.moc"

1
plugins/mpriscontrol/mpriscontrolplugin.h
View file

@ -52,6 +52,7 @@ private:
void addPlayer(const QString& ifaceName); void addPlayer(const QString& ifaceName);
void removePlayer(const QString& ifaceName); void removePlayer(const QString& ifaceName);
void sendPlayerList(); void sendPlayerList();
void mprisPlayerMetadataToNetworkPackage(NetworkPackage& np, const QVariantMap& nowPlayingMap) const;
QHash<QString, QString> playerList; QHash<QString, QString> playerList;
int prevVolume; int prevVolume;