Merge remote-tracking branch 'javispedro/js-testing'

Conflicts:
	daemon/daemon.pro
	daemon/dbusconnector.cpp
	daemon/manager.cpp
	daemon/watchcommands.cpp
	daemon/watchcommands.h
	daemon/watchconnector.cpp
	daemon/watchconnector.h
	log4qt-debug.conf
	log4qt-release.conf
	rpm/pebble.spec
	rpm/pebble.yaml

1 files changed, 0 insertions, 122 deletions

diff --git a/daemon/watchcommands.cpp b/daemon/watchcommands.cpp
deleted file mode 100644
index 9845849..0000000
--- a/daemon/watchcommands.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-#include "watchcommands.h"
-
-#include <QDBusConnection>
-#include <QDBusMessage>
-#include <QDBusReply>
-
-using namespace watch;
-
-WatchCommands::WatchCommands(WatchConnector *watch, QObject *parent) :
-    QObject(parent), l(metaObject()->className()), watch(watch)
-{}
-
-void WatchCommands::processMessage(uint endpoint, QByteArray data)
-{
-    qCDebug(l) << __FUNCTION__ << endpoint << "/" << data.toHex() << data.length();
-    switch (endpoint) {
-    case WatchConnector::watchPHONE_VERSION:
-        watch->sendPhoneVersion();
-        break;
-    case WatchConnector::watchPHONE_CONTROL:
-        if (data.at(0) == WatchConnector::callHANGUP) {
-            emit hangup();
-        }
-        break;
-    case WatchConnector::watchMUSIC_CONTROL:
-        musicControl(WatchConnector::MusicControl(data.at(0)));
-        break;
-    case WatchConnector::watchSYSTEM_MESSAGE:
-        qCDebug(l) << "Got SYSTEM_MESSAGE" << WatchConnector::SystemMessage(data.at(0));
-        // TODO: handle systemBLUETOOTH_START_DISCOVERABLE/systemBLUETOOTH_END_DISCOVERABLE
-        break;
-
-    default:
-        qCDebug(l) << __FUNCTION__ << "endpoint" << endpoint << "not supported yet";
-    }
-}
-
-void WatchCommands::onMprisMetadataChanged(QVariantMap metadata)
-{
-    QString track = metadata.value("xesam:title").toString();
-    QString album = metadata.value("xesam:album").toString();
-    QString artist = metadata.value("xesam:artist").toString();
-    qCDebug(l) << __FUNCTION__ << track << album << artist;
-    watch->sendMusicNowPlaying(track, album, artist);
-}
-
-void WatchCommands::musicControl(WatchConnector::MusicControl operation)
-{
-    qCDebug(l) << "Operation:" << operation;
-
-    QString mpris = parent()->property("mpris").toString();
-    if (mpris.isEmpty()) {
-        qCDebug(l) << "No mpris interface active";
-        return;
-    }
-
-    QString method;
-
-    switch(operation) {
-    case WatchConnector::musicPLAY_PAUSE:
-        method = "PlayPause";
-        break;
-    case WatchConnector::musicPAUSE:
-        method = "Pause";
-        break;
-    case WatchConnector::musicPLAY:
-        method = "Play";
-        break;
-    case WatchConnector::musicNEXT:
-        method = "Next";
-        break;
-    case WatchConnector::musicPREVIOUS:
-        method = "Previous";
-        break;
-    case WatchConnector::musicVOLUME_UP:
-    case WatchConnector::musicVOLUME_DOWN: {
-            QDBusReply<QDBusVariant> VolumeReply = QDBusConnection::sessionBus().call(
-                        QDBusMessage::createMethodCall(mpris, "/org/mpris/MediaPlayer2", "org.freedesktop.DBus.Properties", "Get")
-                        << "org.mpris.MediaPlayer2.Player" << "Volume");
-            if (VolumeReply.isValid()) {
-                double volume = VolumeReply.value().variant().toDouble();
-                if (operation == WatchConnector::musicVOLUME_UP) {
-                    volume += 0.1;
-                }
-                else {
-                    volume -= 0.1;
-                }
-                qCDebug(l) << "Setting volume" << volume;
-                QDBusError err = QDBusConnection::sessionBus().call(
-                            QDBusMessage::createMethodCall(mpris, "/org/mpris/MediaPlayer2", "org.freedesktop.DBus.Properties", "Set")
-                            << "org.mpris.MediaPlayer2.Player" << "Volume" << QVariant::fromValue(QDBusVariant(volume)));
-                if (err.isValid()) {
-                    qCCritical(l) << err.message();
-                }
-            }
-            else {
-                qCCritical(l) << VolumeReply.error().message();
-            }
-        }
-        return;
-    case WatchConnector::musicGET_NOW_PLAYING:
-        onMprisMetadataChanged(parent()->property("mprisMetadata").toMap());
-        return;
-
-    case WatchConnector::musicSEND_NOW_PLAYING:
-        qCWarning(l) << "Operation" << operation << "not supported";
-        return;
-    }
-
-    if (method.isEmpty()) {
-        qCCritical(l) << "Requested unsupported operation" << operation;
-        return;
-    }
-
-    qCDebug(l) << operation << "->" << method;
-
-    QDBusError err = QDBusConnection::sessionBus().call(
-                QDBusMessage::createMethodCall(mpris, "/org/mpris/MediaPlayer2", "org.mpris.MediaPlayer2.Player", method));
-    if (err.isValid()) {
-        qCCritical(l) << err.message();
-    }
-}