Merge lp:~mzanetti/unity8/aethercast-cursor into lp:unity8

[Michael Zanetti]

Add support for cursor streaming over aethercast

WIP, want a diff

[lp:~mzanetti/unity8/aethercast-cursor]

2101. By Michael Zanetti on 2015-12-17

ABS, not REL

2102. By Michael Zanetti on 2016-01-08

more work on providing a cursor to aethercast

2103. By Michael Zanetti on 2016-01-08

merge trunk

2104. By Michael Zanetti on 2016-01-12

make whitespace test happy

2105. By Michael Zanetti on 2016-02-19

merge trunk

2106. By Michael Zanetti on 2016-02-19

fix plugin name

2107. By Michael Zanetti on 2016-02-19

install files

2108. By Michael Zanetti on 2016-02-19

typo--

2109. By Michael Zanetti on 2016-03-09

merge trunk

2110. By Michael Zanetti on 2016-05-04

merge trunk

Unmerged revisions

2110. By Michael Zanetti on 2016-05-04

merge trunk

2109. By Michael Zanetti on 2016-03-09

merge trunk

2108. By Michael Zanetti on 2016-02-19

typo--

2107. By Michael Zanetti on 2016-02-19

install files

2106. By Michael Zanetti on 2016-02-19

fix plugin name

2105. By Michael Zanetti on 2016-02-19

merge trunk

2104. By Michael Zanetti on 2016-01-12

make whitespace test happy

2103. By Michael Zanetti on 2016-01-08

merge trunk

2102. By Michael Zanetti on 2016-01-08

more work on providing a cursor to aethercast

2101. By Michael Zanetti on 2015-12-17

ABS, not REL

=== modified file 'debian/unity8-private.install'
--- debian/unity8-private.install	2016-04-04 13:38:56 +0000
+++ debian/unity8-private.install	2016-05-04 14:25:35 +0000
@@ -1,5 +1,6 @@
 usr/lib/*/libunity8-private.*
 usr/lib/*/unity8/libUbuntuGestures*
+usr/lib/*/unity8/qml/Aethercast
 usr/lib/*/unity8/qml/AccountsService
 usr/lib/*/unity8/qml/Cursor
 usr/lib/*/unity8/qml/Dash

=== added directory 'plugins/Aethercast'
=== added file 'plugins/Aethercast/CMakeLists.txt'
--- plugins/Aethercast/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/Aethercast/CMakeLists.txt	2016-05-04 14:25:35 +0000
@@ -0,0 +1,11 @@
+add_library(Aethercast-qml MODULE
+    plugin.cpp
+    aethercastmanager.cpp
+    inputprovider.cpp
+    inputprovideradaptor.cpp
+    managerinterface.cpp
+    )
+
+qt5_use_modules(Aethercast-qml Qml Gui DBus)
+
+add_unity8_plugin(Aethercast 0.1 Aethercast TARGETS Aethercast-qml)

=== added file 'plugins/Aethercast/aethercastmanager.cpp'
--- plugins/Aethercast/aethercastmanager.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Aethercast/aethercastmanager.cpp	2016-05-04 14:25:35 +0000
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "aethercastmanager.h"
+#include "managerinterface.h"
+#include "inputprovider.h"
+
+#include <QDebug>
+#include <QDBusConnection>
+
+#define MANAGER_PATH QStringLiteral("/org/aethercast/InputProvider")
+
+AethercastManager::AethercastManager(QObject *parent):
+    QObject(parent),
+    m_manager(new ManagerInterface(QStringLiteral("org.aethercast"), QStringLiteral("/org/aethercast"), QDBusConnection::systemBus(), this)),
+    m_inputProvider(new InputProvider(this))
+{
+    QDBusConnection::systemBus().registerObject(MANAGER_PATH, QStringLiteral("org.aethercast.InputProvider"), m_inputProvider);
+    m_manager->RegisterInputProvider(QDBusObjectPath(MANAGER_PATH), QVariantMap());
+
+    connect(m_inputProvider, &InputProvider::cursorChanged, this, &AethercastManager::cursorChanged);
+    connect(m_inputProvider, &InputProvider::mouseXChanged, this, &AethercastManager::mouseXChanged);
+    connect(m_inputProvider, &InputProvider::mouseYChanged, this, &AethercastManager::mouseYChanged);
+}
+
+AethercastManager::~AethercastManager()
+{
+    m_manager->UnregisterInputProvider(QDBusObjectPath(MANAGER_PATH));
+}
+
+int AethercastManager::mouseX() const
+{
+    return m_inputProvider->mouseX();
+}
+
+void AethercastManager::setMouseX(int mouseX)
+{
+    if (mouseX != m_inputProvider->mouseX()) {
+        m_inputProvider->setMouseX(mouseX);
+    }
+}
+
+int AethercastManager::mouseY() const
+{
+    return m_inputProvider->mouseY();
+}
+
+void AethercastManager::setMouseY(int mouseY)
+{
+    if (mouseY != m_inputProvider->mouseY()) {
+        m_inputProvider->setMouseY(mouseY);
+    }
+}
+
+QString AethercastManager::cursor() const
+{
+    return m_inputProvider->cursor();
+}
+
+void AethercastManager::setCursor(const QString &cursor)
+{
+    m_inputProvider->setCursorSource(cursor);
+}

=== added file 'plugins/Aethercast/aethercastmanager.h'
--- plugins/Aethercast/aethercastmanager.h	1970-01-01 00:00:00 +0000
+++ plugins/Aethercast/aethercastmanager.h	2016-05-04 14:25:35 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef AETHERCAST_MANAGER_H
+#define AETHERCAST_MANAGER_H
+
+#include <QtCore/QObject>
+#include <QtGui/QColor>
+
+class ManagerInterface;
+class InputProvider;
+
+class AethercastManager: public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int mouseX READ mouseX WRITE setMouseX NOTIFY mouseXChanged)
+    Q_PROPERTY(int mouseY READ mouseY WRITE setMouseY NOTIFY mouseYChanged)
+    Q_PROPERTY(QString cursor READ cursor WRITE setCursor NOTIFY cursorChanged)
+
+public:
+    explicit AethercastManager(QObject *parent = 0);
+    ~AethercastManager();
+
+    int mouseX() const;
+    void setMouseX(int mouseX);
+
+    int mouseY() const;
+    void setMouseY(int mouseY);
+
+    QString cursor() const;
+    void setCursor(const QString &cursor);
+
+//public Q_SLOTS:
+//    void sendMousePosition(int x, int y);
+
+Q_SIGNALS:
+    void cursorChanged();
+    void mouseXChanged();
+    void mouseYChanged();
+
+private:
+    ManagerInterface *m_manager;
+    InputProvider *m_inputProvider;
+};
+
+#endif

=== added file 'plugins/Aethercast/inputprovider.cpp'
--- plugins/Aethercast/inputprovider.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Aethercast/inputprovider.cpp	2016-05-04 14:25:35 +0000
@@ -0,0 +1,159 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "inputprovider.h"
+#include "inputprovideradaptor.h"
+
+#include <linux/input.h>
+#include <unistd.h>
+
+#include <QStandardPaths>
+
+
+InputProvider::InputProvider(QObject *parent):
+    QObject(parent),
+    m_adaptor(new InputProviderAdaptor(this))
+{
+
+}
+
+void InputProvider::setMouseX(int x)
+{
+    m_x = x;
+
+    if (!m_file.isOpen()) {
+        return;
+    }
+
+    struct input_event event;
+    memset(&event, 0, sizeof(event));
+    clock_gettime(CLOCK_MONOTONIC, (timespec*)&event.time);
+    event.type = EV_ABS;
+    event.code = ABS_X;
+    event.value = m_x;
+    write(m_file.handle(), &event, sizeof(event));
+
+    Q_EMIT mouseXChanged();
+}
+
+void InputProvider::setMouseY(int y)
+{
+    m_y = y;
+
+    if (!m_file.isOpen()) {
+        return;
+    }
+
+    struct input_event event;
+    memset(&event, 0, sizeof(event));
+    clock_gettime(CLOCK_MONOTONIC, (timespec*)&event.time);
+    event.type = EV_ABS;
+    event.code = ABS_Y;
+    event.value = m_y;
+    write(m_file.handle(), &event, sizeof(event));
+
+    Q_EMIT mouseYChanged();
+}
+
+int InputProvider::mouseX() const
+{
+    return m_x;
+}
+
+int InputProvider::mouseY() const
+{
+    return m_y;
+}
+
+QString InputProvider::cursorSource() const
+{
+    return m_cursorSource;
+}
+
+QString InputProvider::cursor() const
+{
+    return m_cursor;
+}
+
+void InputProvider::setCursorSource(const QString &cursorSource)
+{
+    if (m_cursorSource == cursorSource) {
+        return;
+    }
+
+//    QStringList parts = cursorSource.split('/');
+//    if (parts.count() != 2) {
+//        qWarning() << "Invalid cursor image. Needs to be \"theme/file\"";
+//        return;
+//    }
+//    QString theme = parts.first();
+//    QString cursor = parts.last();
+
+//    // Check if we have this in cache
+//    QString cachePath = QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
+//    QFile cacheFile(cachePath + QStringLiteral("/cursors/") + theme + QStringLiteral("/") + cursor + QStringLiteral(".png"));
+
+//    if (!cacheFile.exists()) {
+//        XcursorImages *xcursorImages = XcursorLibraryLoadImages(QFile::encodeName(parts.last()), QFile::encodeName(parts.first()), 32);
+//        if (!xcursorImages || xcursorImages->nimage == 0) {
+//            qWarning() << "Error reading XcursorsImages for" << theme << cursor;
+//            return;
+//        }
+
+//        XcursorImage *xcursorImage = xcursorImages->images[0];
+
+//        QImage qimage = QImage((uchar*)xcursorImage->pixels, xcursorImage->width, xcursorImage->height, QImage::Format_ARGB32);
+//    }
+
+//    m_cursor = cacheFile.fileName();
+//    Q_EMIT cursorChanged();
+
+//    QVariantMap propertyChanges;
+//    propertyChanges["cursor"] = cursor;
+//    Q_EMIT PropertiesChanged("org.aethercast.InputProvider", propertyChanges, QStringList());
+}
+
+void InputProvider::NewConnection(const QDBusUnixFileDescriptor &fd, const QVariantMap &options)
+{
+    Q_UNUSED(options)
+    qDebug() << "have new connection" << fd.fileDescriptor();
+
+    if (m_file.isOpen()) {
+        qWarning() << "Already have an Aethercast connection. Closing old one.";
+        m_file.close();
+    }
+
+    if (!m_file.open(fd.fileDescriptor(), QFile::WriteOnly)) {
+        qWarning() << "Cannot open file for writing. Streaming mouse cursor to Aethercast will not work.";
+        return;
+    }
+
+    struct input_event event;
+    memset(&event, 0, sizeof(event));
+    clock_gettime(CLOCK_MONOTONIC, (timespec*)&event.time);
+    event.type = EV_ABS;
+    event.code = ABS_X;
+    event.value = m_x;
+    write(m_file.handle(), &event, sizeof(event));
+    event.code = ABS_Y;
+    event.value = m_y;
+    write(m_file.handle(), &event, sizeof(event));
+}
+
+void InputProvider::RequestDisconnection()
+{
+    m_file.close();
+}

=== added file 'plugins/Aethercast/inputprovider.h'
--- plugins/Aethercast/inputprovider.h	1970-01-01 00:00:00 +0000
+++ plugins/Aethercast/inputprovider.h	2016-05-04 14:25:35 +0000
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef INPUT_PROVIDER_H
+#define INPUT_PROVIDER_H
+
+#include <QDBusConnection>
+#include <QDBusUnixFileDescriptor>
+#include <QFile>
+
+class InputProviderAdaptor;
+
+class InputProvider: public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString cursor READ cursor)
+
+public:
+    InputProvider(QObject *parent = nullptr);
+
+    // exposed to Shell
+    void setMouseX(int x);
+    void setMouseY(int y);
+    int mouseX() const;
+    int mouseY() const;
+    void setCursorSource(const QString &cursor);
+    QString cursorSource() const;
+
+    // exposed on D-Bus
+    QString cursor() const;
+
+public Q_SLOTS:
+    void NewConnection(const QDBusUnixFileDescriptor &fd, const QVariantMap &options);
+    void RequestDisconnection();
+
+Q_SIGNALS:
+    void cursorChanged();
+    void mouseXChanged();
+    void mouseYChanged();
+    void PropertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList &invalid);
+
+private:
+    int m_x = 0;
+    int m_y = 0;
+    QString m_cursorSource;
+    QString m_cursor;
+    QFile m_file;
+    InputProviderAdaptor *m_adaptor;
+};
+
+#endif

=== added file 'plugins/Aethercast/inputprovideradaptor.cpp'
--- plugins/Aethercast/inputprovideradaptor.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Aethercast/inputprovideradaptor.cpp	2016-05-04 14:25:35 +0000
@@ -0,0 +1,52 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp -a inputprovideradaptor -c InputProviderAdaptor org.aethercast.xml org.aethercast.InputProvider
+ *
+ * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
+ *
+ * This is an auto-generated file.
+ * Do not edit! All changes made to it will be lost.
+ */
+
+#include "inputprovideradaptor.h"
+#include <QtCore/QMetaObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+
+/*
+ * Implementation of adaptor class InputProviderAdaptor
+ */
+
+InputProviderAdaptor::InputProviderAdaptor(QObject *parent)
+    : QDBusAbstractAdaptor(parent)
+{
+    // constructor
+    setAutoRelaySignals(true);
+}
+
+InputProviderAdaptor::~InputProviderAdaptor()
+{
+    // destructor
+}
+
+QString InputProviderAdaptor::cursor() const
+{
+    // get the value of property cursor
+    return qvariant_cast< QString >(parent()->property("cursor"));
+}
+
+void InputProviderAdaptor::NewConnection(const QDBusUnixFileDescriptor &fd, const QVariantMap &options)
+{
+    // handle method call org.aethercast.InputProvider.NewConnection
+    QMetaObject::invokeMethod(parent(), "NewConnection", Q_ARG(QDBusUnixFileDescriptor, fd), Q_ARG(QVariantMap, options));
+}
+
+void InputProviderAdaptor::RequestDisconnection()
+{
+    // handle method call org.aethercast.InputProvider.RequestDisconnection
+    QMetaObject::invokeMethod(parent(), "RequestDisconnection");
+}

=== added file 'plugins/Aethercast/inputprovideradaptor.h'
--- plugins/Aethercast/inputprovideradaptor.h	1970-01-01 00:00:00 +0000
+++ plugins/Aethercast/inputprovideradaptor.h	2016-05-04 14:25:35 +0000
@@ -0,0 +1,62 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.8
+ *
+ * ATTENTION: The PropertiesChanged signal is added manually
+ *
+ * Command line was: qdbusxml2cpp -a inputprovideradaptor -c InputProviderAdaptor org.aethercast.xml org.aethercast.InputProvider
+ *
+ * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
+ *
+ * This is an auto-generated file.
+ * This file may have been hand-edited. Look for HAND-EDIT comments
+ * before re-generating it.
+ */
+
+#ifndef INPUTPROVIDERADAPTOR_H
+#define INPUTPROVIDERADAPTOR_H
+
+#include <QtCore/QObject>
+#include <QtDBus/QtDBus>
+QT_BEGIN_NAMESPACE
+class QByteArray;
+template<class T> class QList;
+template<class Key, class Value> class QMap;
+class QString;
+class QStringList;
+class QVariant;
+QT_END_NAMESPACE
+
+/*
+ * Adaptor class for interface org.aethercast.InputProvider
+ */
+class InputProviderAdaptor: public QDBusAbstractAdaptor
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "org.aethercast.InputProvider")
+    Q_CLASSINFO("D-Bus Introspection", ""
+"  <interface name=\"org.aethercast.InputProvider\">\n"
+"    <method name=\"NewConnection\">\n"
+"      <arg direction=\"in\" type=\"h\" name=\"fd\"/>\n"
+"      <arg direction=\"in\" type=\"a{sv}\" name=\"options\"/>\n"
+"      <annotation value=\"QVariantMap\" name=\"org.qtproject.QtDBus.QtTypeName.In1\"/>\n"
+"    </method>\n"
+"    <method name=\"RequestDisconnection\"/>\n"
+"    <property access=\"read\" type=\"s\" name=\"cursor\"/>\n"
+"  </interface>\n"
+        "")
+public:
+    InputProviderAdaptor(QObject *parent);
+    virtual ~InputProviderAdaptor();
+
+public: // PROPERTIES
+    Q_PROPERTY(QString cursor READ cursor)
+    QString cursor() const;
+
+public Q_SLOTS: // METHODS
+    void NewConnection(const QDBusUnixFileDescriptor &fd, const QVariantMap &options);
+    void RequestDisconnection();
+Q_SIGNALS: // SIGNALS
+    void PropertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList &invalid);
+};
+
+#endif

=== added file 'plugins/Aethercast/managerinterface.cpp'
--- plugins/Aethercast/managerinterface.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Aethercast/managerinterface.cpp	2016-05-04 14:25:35 +0000
@@ -0,0 +1,25 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp -p managerinterface -c ManagerInterface org.aethercast.xml org.aethercast.Manager
+ *
+ * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
+ *
+ * This is an auto-generated file.
+ * This file may have been hand-edited. Look for HAND-EDIT comments
+ * before re-generating it.
+ */
+
+#include "managerinterface.h"
+
+/*
+ * Implementation of interface class ManagerInterface
+ */
+
+ManagerInterface::ManagerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
+    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
+{
+}
+
+ManagerInterface::~ManagerInterface()
+{
+}

=== added file 'plugins/Aethercast/managerinterface.h'
--- plugins/Aethercast/managerinterface.h	1970-01-01 00:00:00 +0000
+++ plugins/Aethercast/managerinterface.h	2016-05-04 14:25:35 +0000
@@ -0,0 +1,93 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp -p managerinterface -c ManagerInterface org.aethercast.xml org.aethercast.Manager
+ *
+ * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
+ *
+ * This is an auto-generated file.
+ * Do not edit! All changes made to it will be lost.
+ */
+
+#ifndef MANAGERINTERFACE_H
+#define MANAGERINTERFACE_H
+
+#include <QtCore/QObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+#include <QtDBus/QtDBus>
+
+/*
+ * Proxy class for interface org.aethercast.Manager
+ */
+class ManagerInterface: public QDBusAbstractInterface
+{
+    Q_OBJECT
+public:
+    static inline const char *staticInterfaceName()
+    { return "org.aethercast.Manager"; }
+
+public:
+    ManagerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+
+    ~ManagerInterface();
+
+    Q_PROPERTY(QStringList Capabilities READ capabilities)
+    inline QStringList capabilities() const
+    { return qvariant_cast< QStringList >(property("Capabilities")); }
+
+    Q_PROPERTY(bool Scanning READ scanning)
+    inline bool scanning() const
+    { return qvariant_cast< bool >(property("Scanning")); }
+
+    Q_PROPERTY(QString State READ state)
+    inline QString state() const
+    { return qvariant_cast< QString >(property("State")); }
+
+public Q_SLOTS: // METHODS
+    inline QDBusPendingReply<> RegisterInputProvider(const QDBusObjectPath &path, const QVariantMap &options)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(path) << QVariant::fromValue(options);
+        return asyncCallWithArgumentList(QStringLiteral("RegisterInputProvider"), argumentList);
+    }
+
+    inline QDBusPendingReply<> RegisterMediaManager(const QDBusObjectPath &path)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(path);
+        return asyncCallWithArgumentList(QStringLiteral("RegisterMediaManager"), argumentList);
+    }
+
+    inline QDBusPendingReply<> Scan()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QStringLiteral("Scan"), argumentList);
+    }
+
+    inline QDBusPendingReply<> UnregisterInputProvider(const QDBusObjectPath &path)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(path);
+        return asyncCallWithArgumentList(QStringLiteral("UnregisterInputProvider"), argumentList);
+    }
+
+    inline QDBusPendingReply<> UnregisterMediaManager(const QDBusObjectPath &path)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(path);
+        return asyncCallWithArgumentList(QStringLiteral("UnregisterMediaManager"), argumentList);
+    }
+
+Q_SIGNALS: // SIGNALS
+};
+
+namespace org {
+  namespace aethercast {
+    typedef ::ManagerInterface Manager;
+  }
+}
+#endif

=== added file 'plugins/Aethercast/org.aethercast.xml'
--- plugins/Aethercast/org.aethercast.xml	1970-01-01 00:00:00 +0000
+++ plugins/Aethercast/org.aethercast.xml	2016-05-04 14:25:35 +0000
@@ -0,0 +1,52 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+    <interface name="org.aethercast.Manager">
+        <method name="RegisterMediaManager">
+            <arg name="path" type="o" direction="in"/>
+        </method>
+        <method name="UnregisterMediaManager">
+            <arg name="path" type="o" direction="in"/>
+        </method>
+        <method name="Scan"/>
+        <method name="RegisterInputProvider">
+            <arg name="path" type="o" direction="in"/>
+            <arg name="options" type="a{sv}" direction="in"/>
+            <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
+        </method>
+        <method name="UnregisterInputProvider">
+            <arg name="path" type="o" direction="in"/>
+        </method>
+        <property name="State" type="s" access="read"/>
+        <property name="Capabilities" type="as" access="read"/>
+        <property name="Scanning" type="b" access="read"/>
+    </interface>
+    <interface name="org.aethercast.InputProvider">
+        <method name="NewConnection">
+            <arg name="fd" type="h" direction="in"/>
+            <arg name="options" type="a{sv}" direction="in"/>
+            <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
+        </method>
+        <method name="RequestDisconnection"/>
+        <property name="cursor" type="s" access="read"/>
+    </interface>
+    <interface name="org.aethercast.Device">
+        <method name="Connect">
+            <arg name="role" type="s" direction="in"/>
+        </method>
+        <method name="Disconnect"/>
+        <property name="State" type="s" access="read"/>
+        <property name="Address" type="s" access="read"/>
+        <property name="Name" type="s" access="read"/>
+        <property name="Capabilities" type="as" access="read"/>
+    </interface>
+    <interface name="org.aethercast.MediaManager">
+        <method name="Configure">
+            <arg name="address" type="s"/>
+            <arg name="port" type="i"/>
+        </method>
+        <method name="Play"/>
+        <method name="Pause"/>
+        <method name="Teardown"/>
+    </interface>
+</node>

=== added file 'plugins/Aethercast/plugin.cpp'
--- plugins/Aethercast/plugin.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Aethercast/plugin.cpp	2016-05-04 14:25:35 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "plugin.h"
+#include "aethercastmanager.h"
+
+#include <QtQml/qqml.h>
+#include <QDebug>
+
+static QObject *manager_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+    qDebug() << "imageprovider is" << engine->imageProvider("cursor");
+    return new AethercastManager();
+}
+
+void AethercastPlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String("Aethercast"));
+    qmlRegisterSingletonType<AethercastManager>(uri, 0, 1, "AethercastManager", manager_provider);
+}

=== added file 'plugins/Aethercast/plugin.h'
--- plugins/Aethercast/plugin.h	1970-01-01 00:00:00 +0000
+++ plugins/Aethercast/plugin.h	2016-05-04 14:25:35 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef AETHERCAST_PLUGIN_H
+#define AETHERCAST_PLUGIN_H
+
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlExtensionPlugin>
+
+class AethercastPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri) override;
+};
+
+#endif

=== added file 'plugins/Aethercast/qmldir'
--- plugins/Aethercast/qmldir	1970-01-01 00:00:00 +0000
+++ plugins/Aethercast/qmldir	2016-05-04 14:25:35 +0000
@@ -0,0 +1,3 @@
+module Aethercast
+plugin Aethercast-qml
+typeinfo Lights.qmltypes

=== modified file 'plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	2016-04-04 13:37:49 +0000
+++ plugins/CMakeLists.txt	2016-05-04 14:25:35 +0000
@@ -12,6 +12,7 @@
 endmacro()
 
 add_subdirectory(AccountsService)
+add_subdirectory(Aethercast)
 add_subdirectory(Cursor)
 add_subdirectory(GlobalShortcut)
 add_subdirectory(Greeter)

=== modified file 'plugins/Cursor/CursorImageProvider.h'
--- plugins/Cursor/CursorImageProvider.h	2015-11-16 14:27:31 +0000
+++ plugins/Cursor/CursorImageProvider.h	2016-05-04 14:25:35 +0000
@@ -63,8 +63,12 @@
     CursorImageProvider();
     virtual ~CursorImageProvider();
 
-    static CursorImageProvider *instance() { return m_instance; }
-
+    static CursorImageProvider *instance() {
+        if (m_instance == nullptr) {
+            new CursorImageProvider();
+        }
+        return m_instance;
+    }
 
     QImage requestImage(const QString &cursorName, QSize *size, const QSize &requestedSize) override;
 
@@ -89,4 +93,15 @@
     static CursorImageProvider *m_instance;
 };
 
+class CursorImageHelper: public QObject
+{
+    Q_OBJECT
+public:
+    CursorImageHelper(QObject *parent = 0): QObject(parent) {}
+    Q_INVOKABLE QImage cursorImage(const QString &cursorName) {
+        QSize s;
+        return CursorImageProvider::instance()->requestImage(cursorName, &s, QSize());
+    }
+};
+
 #endif // CURSORIMAGEPROVIDER_H

=== modified file 'plugins/Cursor/plugin.cpp'
--- plugins/Cursor/plugin.cpp	2015-11-20 15:01:39 +0000
+++ plugins/Cursor/plugin.cpp	2016-05-04 14:25:35 +0000
@@ -29,11 +29,12 @@
 {
     Q_ASSERT(uri == QLatin1String("Cursor"));
     qmlRegisterType<MousePointer>(uri, 1, 0, "MousePointer");
+    qmlRegisterType<CursorImageHelper>(uri, 1, 0, "CursorImageHelper");
 }
 
 void CursorPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 {
     QQmlExtensionPlugin::initializeEngine(engine, uri);
 
-    engine->addImageProvider(QStringLiteral("cursor"), new CursorImageProvider());
+    engine->addImageProvider(QStringLiteral("cursor"), CursorImageProvider::instance());
 }

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2016-04-27 15:01:10 +0000
+++ qml/Shell.qml	2016-05-04 14:25:35 +0000
@@ -42,6 +42,7 @@
 import Unity.DashCommunicator 0.1
 import Unity.Indicators 0.1 as Indicators
 import Cursor 1.0
+import Aethercast 0.1
 import WindowManager 0.1
 
 
@@ -224,11 +225,25 @@
         }
     }
 
+    CursorImageHelper {
+        id: cursorImageHelper
+    }
+
     GSettings {
         id: settings
         schema.id: "com.canonical.Unity8"
     }
 
+    Binding { target: AethercastManager; property: "x"; value: cursor.x }
+    Binding { target: AethercastManager; property: "cursorImage"; value: cursorImageHelper.cursorImage(cursor.themeName + "/" + cursor.cursorName) }
+
+//    AethercastManager {
+//        id: aethercast
+//        cursorX: cursor.x
+//        cursorY: cursor.y
+//        cursor: mousePointer.themeName + "/" + mousePointer.cursorName
+//    }
+
     Item {
         id: stages
         objectName: "stages"