diff options
| author | Tomasz Sterna <tomek@xiaoka.com> | 2015-04-25 08:42:47 +0200 |
|---|---|---|
| committer | Tomasz Sterna <tomek@xiaoka.com> | 2015-04-25 08:42:47 +0200 |
| commit | d8deaf4385b20fa5e658dd0ef4cfc5631461e6fc (patch) | |
| tree | dc99af7af21dc0b686e874bf02cabec30cf98292 | |
| parent | 55a97fbc8cfd51dafeda9849b00a49fa813c8b4d (diff) | |
| parent | 39deec0aa83d216178cb8b9ba88377ff431942d4 (diff) | |
Switch artist and track fields
| -rw-r--r-- | daemon/musicmanager.cpp | 8 | ||||
| -rw-r--r-- | daemon/watchconnector.cpp | 7 | ||||
| -rw-r--r-- | daemon/watchconnector.h | 2 |
3 files changed, 8 insertions, 9 deletions
diff --git a/daemon/musicmanager.cpp b/daemon/musicmanager.cpp index 11ff6fd..5ae1786 100644 --- a/daemon/musicmanager.cpp +++ b/daemon/musicmanager.cpp @@ -116,13 +116,13 @@ void MusicManager::sendCurrentMprisMetadata() { Q_ASSERT(watch->isConnected()); - QString track = _curMetadata.value("xesam:title").toString().left(30); - QString album = _curMetadata.value("xesam:album").toString().left(30); QString artist = _curMetadata.value("xesam:artist").toString().left(30); + QString album = _curMetadata.value("xesam:album").toString().left(30); + QString track = _curMetadata.value("xesam:title").toString().left(30); - qCDebug(l) << "sending mpris metadata:" << track << album << artist; + qCDebug(l) << "sending mpris metadata:" << artist << album << track; - watch->sendMusicNowPlaying(track, album, artist); + watch->sendMusicNowPlaying(artist, album, track); } void MusicManager::callMprisMethod(const QString &method) diff --git a/daemon/watchconnector.cpp b/daemon/watchconnector.cpp index 8d1dbac..0ccd089 100644 --- a/daemon/watchconnector.cpp +++ b/daemon/watchconnector.cpp @@ -513,13 +513,12 @@ void WatchConnector::sendEmailNotification(QString sender, QString data, QString sendNotification(leadEMAIL, sender, data, subject); } -void WatchConnector::sendMusicNowPlaying(QString track, QString album, QString artist) +void WatchConnector::sendMusicNowPlaying(QString artist, QString album, QString track) { QStringList tmp; - tmp.append(track.left(30)); - tmp.append(album.left(30)); tmp.append(artist.left(30)); - + tmp.append(album.left(30)); + tmp.append(track.left(30)); QByteArray res = buildMessageData(leadNOW_PLAYING_DATA, tmp); sendMessage(watchMUSIC_CONTROL, res); diff --git a/daemon/watchconnector.h b/daemon/watchconnector.h index 18f5fba..07895b7 100644 --- a/daemon/watchconnector.h +++ b/daemon/watchconnector.h @@ -228,7 +228,7 @@ public slots: void sendEmailNotification(QString sender, QString data, QString subject); void sendFacebookNotification(QString sender, QString data); void sendTwitterNotification(QString sender, QString data); - void sendMusicNowPlaying(QString track, QString album, QString artist); + void sendMusicNowPlaying(QString artist, QString album, QString track); void sendPhoneVersion(); void sendFirmwareState(bool ok); |