From e99e0f6d456e86be244ed3baa022088ec859944a Mon Sep 17 00:00:00 2001 From: Tomasz Sterna Date: Sun, 13 Jul 2014 04:09:47 +0200 Subject: Implemented WatchConnector::sendMusicNowPlaying --- daemon/watchconnector.cpp | 20 ++++++++++++++++---- daemon/watchconnector.h | 18 ++++++++++++++++++ 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/daemon/watchconnector.cpp b/daemon/watchconnector.cpp index b1b9587..2bc8c75 100644 --- a/daemon/watchconnector.cpp +++ b/daemon/watchconnector.cpp @@ -244,7 +244,7 @@ QByteArray WatchConnector::buildMessageData(unsigned int lead, QStringList data) void WatchConnector::sendPhoneVersion() { unsigned int sessionCap = sessionCapGAMMA_RAY; - unsigned int remoteCap = remoteCapTELEPHONY | remoteCapSMS | osANDROID; + unsigned int remoteCap = remoteCapTELEPHONY | remoteCapSMS | osLINUX; QByteArray res; //Prefix @@ -301,7 +301,7 @@ void WatchConnector::sendNotification(unsigned int lead, QString sender, QString tmp.append(sender); tmp.append(data); tmp.append(timeStamp()); - if (lead == 0) tmp.append(subject); + if (lead == leadEMAIL) tmp.append(subject); QByteArray res = buildMessageData(lead, tmp); @@ -310,12 +310,24 @@ void WatchConnector::sendNotification(unsigned int lead, QString sender, QString void WatchConnector::sendSMSNotification(QString sender, QString data) { - sendNotification(1, sender, data, ""); + sendNotification(leadSMS, sender, data, ""); } void WatchConnector::sendEmailNotification(QString sender, QString data, QString subject) { - sendNotification(0, sender, data, subject); + sendNotification(leadEMAIL, sender, data, subject); +} + +void WatchConnector::sendMusicNowPlaying(QString track, QString album, QString artist) +{ + QStringList tmp; + tmp.append(track); + tmp.append(album); + tmp.append(artist); + + QByteArray res = buildMessageData(leadNOW_PLAYING_DATA, tmp); + + sendMessage(watchMUSIC_CONTROL, res); } void WatchConnector::phoneControl(char act, unsigned int cookie, QStringList datas) diff --git a/daemon/watchconnector.h b/daemon/watchconnector.h index 39e898a..f4059e3 100644 --- a/daemon/watchconnector.h +++ b/daemon/watchconnector.h @@ -71,6 +71,7 @@ public: watchNOTIFICATION = 3000, watchRESOURCE = 4000, watchAPP_MANAGER = 6000, + watchDATA_LOGGING = 6778, watchSCREENSHOT = 8000, watchPUTBYTES = 48879 }; @@ -85,6 +86,22 @@ public: callSTART = 8, callEND = 9 }; + enum { + musicPLAY_PAUSE = 1, + musicPAUSE = 2, + musicPLAY = 3, + musicNEXT = 4, + musicPREVIOUS = 5, + musicVOLUME_UP = 6, + musicVOLUME_DOWN = 7, + musicGET_NOW_PLAYING = 8, + musicSEND_NOW_PLAYING = 9 + }; + enum { + leadEMAIL = 0, + leadSMS = 1, + leadNOW_PLAYING_DATA = 16 + }; enum { sessionCapGAMMA_RAY = 0x80000000 }; @@ -129,6 +146,7 @@ public slots: void sendNotification(unsigned int lead, QString sender, QString data, QString subject); void sendSMSNotification(QString sender, QString data); void sendEmailNotification(QString sender, QString data, QString subject); + void sendMusicNowPlaying(QString track, QString album, QString artist); void sendPhoneVersion(); void buildData(QByteArray &res, QStringList data); -- cgit v1.2.3