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

Request status when connecting

Browse source 
Summary:
Send requestNowPlaying packet when a player is discovered
Depends on D12546

Test Plan: Restart daemon, open app. Status is now displayed correctly, previously it was not until the first update

Reviewers: #kde_connect, apol

Reviewed By: #kde_connect, apol

Subscribers: #kde_connect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D12550
This commit is contained in:
Nicolas Fella 2018-04-28 00:23:45 +02:00
parent 1b622de1f1
commit 88d0e72667
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/mprisremote/mprisremoteplugin.cpp
View file

@ -50,7 +50,7 @@ bool MprisRemotePlugin::receivePacket(const NetworkPacket& np)
return false; return false;
if (np.has(QStringLiteral("player"))) { if (np.has(QStringLiteral("player"))) {
m_players[m_currentPlayer]->parseNetworkPacket(np); m_players[np.get<QString>(QStringLiteral("player"))]->parseNetworkPacket(np);
} }
if (np.has(QStringLiteral("playerList"))) { if (np.has(QStringLiteral("playerList"))) {
@ -59,6 +59,7 @@ bool MprisRemotePlugin::receivePacket(const NetworkPacket& np)
m_players.clear(); m_players.clear();
for (const QString& player : players) { for (const QString& player : players) {
m_players[player] = new MprisRemotePlayer(); m_players[player] = new MprisRemotePlayer();
requestPlayerStatus(player);
} }
if (m_players.empty()) { if (m_players.empty()) {
@ -84,10 +85,10 @@ QString MprisRemotePlugin::dbusPath() const
return "/modules/kdeconnect/devices/" + device()->id() + "/mprisremote"; return "/modules/kdeconnect/devices/" + device()->id() + "/mprisremote";
} }
void MprisRemotePlugin::requestPlayerStatus() void MprisRemotePlugin::requestPlayerStatus(const QString& player)
{ {
NetworkPacket np(PACKET_TYPE_MPRIS_REQUEST, { NetworkPacket np(PACKET_TYPE_MPRIS_REQUEST, {
{"player", m_currentPlayer}, {"player", player},
{"requestNowPlaying", true}, {"requestNowPlaying", true},
{"requestVolume", true}} {"requestVolume", true}}
); );
@ -141,7 +142,7 @@ void MprisRemotePlugin::setPlayer(const QString& player)
{ {
if (m_currentPlayer != player) { if (m_currentPlayer != player) {
m_currentPlayer = player; m_currentPlayer = player;
requestPlayerStatus(); requestPlayerStatus(player);
Q_EMIT propertiesChanged(); Q_EMIT propertiesChanged();
} }
} }

2
plugins/mprisremote/mprisremoteplugin.h
View file

@ -77,7 +77,7 @@ Q_SIGNALS:
void propertiesChanged(); void propertiesChanged();
private: private:
void requestPlayerStatus(); void requestPlayerStatus(const QString& player);
QString m_currentPlayer; QString m_currentPlayer;
QMap<QString, MprisRemotePlayer*> m_players; QMap<QString, MprisRemotePlayer*> m_players;