move the mpris tracking into musicmanager

1 files changed, 12 insertions, 2 deletions

diff --git a/daemon/musicmanager.h b/daemon/musicmanager.h
index ca86ce3..88c46c3 100644
--- a/daemon/musicmanager.h
+++ b/daemon/musicmanager.h
@@ -2,9 +2,10 @@
 #define MUSICMANAGER_H
 
 #include <QObject>
+#include <QDBusContext>
 #include "watchconnector.h"
 
-class MusicManager : public QObject
+class MusicManager : public QObject, protected QDBusContext
 {
     Q_OBJECT
     LOG4QT_DECLARE_QCLASS_LOGGER
@@ -14,12 +15,21 @@ public:
 
 private:
     void musicControl(WatchConnector::MusicControl operation);
+    void switchToService(const QString &service);
+    void setMprisMetadata(const QVariantMap &data);
 
 private slots:
-    void onMprisMetadataChanged(QVariantMap metadata);
+    void handleServiceRegistered(const QString &service);
+    void handleServiceUnregistered(const QString &service);
+    void handleServiceOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner);
+    void handleMprisPropertiesChanged(const QString &interface, const QMap<QString,QVariant> &changed, const QStringList &invalidated);
+    void handleWatchConnected();
 
 private:
     WatchConnector *watch;
+
+    QVariantMap _curMetadata;
+    QString _curService;
 };
 
 #endif // MUSICMANAGER_H