albumart DBus method

[someplayer] / src / dbusadaptor.h

diff --git a/src/dbusadaptor.h b/src/dbusadaptor.h
index 30ebd0b..9d84d89 100644 (file)
--- a/src/dbusadaptor.h
+++ b/src/dbusadaptor.h
@@ -22,6 +22,10 @@
 
 #include <QtCore/QObject>
 #include <QtDBus/QtDBus>
+#include <QTime>
+
+#define _DBUS_ACTION_TIMEOUT_ (500)
+
 class QByteArray;
 template<class T> class QList;
 template<class Key, class Value> class QMap;
@@ -34,47 +38,67 @@ class QVariant;
  */
 class DBusAdaptop: public QDBusAbstractAdaptor
 {
-    Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", "ru.somebody.someplayer")
-    Q_CLASSINFO("D-Bus Introspection", ""
-"  <interface name=\"ru.somebody.someplayer\">\n"
-"    <method name=\"prev\">\n"
-"      <annotation value=\"true\" name=\"org.freedesktop.DBus.Method.NoReply\"/>\n"
-"    </method>\n"
-"    <method name=\"next\">\n"
-"      <annotation value=\"true\" name=\"org.freedesktop.DBus.Method.NoReply\"/>\n"
-"    </method>\n"
-"    <method name=\"toggle\">\n"
-"      <annotation value=\"true\" name=\"org.freedesktop.DBus.Method.NoReply\"/>\n"
-"    </method>\n"
-"    <method name=\"stop\">\n"
-"      <annotation value=\"true\" name=\"org.freedesktop.DBus.Method.NoReply\"/>\n"
-"    </method>\n"
-"    <method name=\"artist\">\n"
-"      <arg direction=\"out\" type=\"s\"/>\n"
-"    </method>\n"
-"    <method name=\"album\">\n"
-"      <arg direction=\"out\" type=\"s\"/>\n"
-"    </method>\n"
-"    <method name=\"title\">\n"
-"      <arg direction=\"out\" type=\"s\"/>\n"
-"    </method>\n"
-"  </interface>\n"
-        "")
+       Q_OBJECT
+       Q_CLASSINFO("D-Bus Interface", "ru.somebody.someplayer")
+       Q_CLASSINFO("D-Bus Introspection", ""
+                   "  <interface name=\"ru.somebody.someplayer\">\n"
+                   "    <method name=\"prev\">\n"
+                   "      <annotation value=\"true\" name=\"org.freedesktop.DBus.Method.NoReply\"/>\n"
+                   "    </method>\n"
+                   "    <method name=\"next\">\n"
+                   "      <annotation value=\"true\" name=\"org.freedesktop.DBus.Method.NoReply\"/>\n"
+                   "    </method>\n"
+                   "    <method name=\"toggle\">\n"
+                   "      <annotation value=\"true\" name=\"org.freedesktop.DBus.Method.NoReply\"/>\n"
+                   "    </method>\n"
+                   "    <method name=\"stop\">\n"
+                   "      <annotation value=\"true\" name=\"org.freedesktop.DBus.Method.NoReply\"/>\n"
+                   "    </method>\n"
+                   "    <method name=\"artist\">\n"
+                   "      <arg direction=\"out\" type=\"s\"/>\n"
+                   "    </method>\n"
+                   "    <method name=\"album\">\n"
+                   "      <arg direction=\"out\" type=\"s\"/>\n"
+                   "    </method>\n"
+                   "    <method name=\"title\">\n"
+                   "      <arg direction=\"out\" type=\"s\"/>\n"
+                   "    </method>\n"
+                   "    <method name=\"title_artist_album\">\n"
+                   "      <arg direction=\"out\" type=\"s\"/>\n"
+                   "    </method>\n"
+                   "    <method name=\"state\">\n"
+                   "      <arg direction=\"out\" type=\"s\"/>\n"
+                   "    </method>\n"
+                   "    <method name=\"albumart\">\n"
+                   "      <arg direction=\"out\" type=\"s\"/>\n"
+                   "    </method>\n"
+                   "  </interface>\n"
+                   "")
 public:
-    DBusAdaptop(QObject *parent);
-    virtual ~DBusAdaptop();
+       DBusAdaptop(QObject *parent);
+       virtual ~DBusAdaptop();
 
 public: // PROPERTIES
 public Q_SLOTS: // METHODS
-    QString album();
-    QString artist();
-    Q_NOREPLY void next();
-    Q_NOREPLY void prev();
-    Q_NOREPLY void stop();
-    QString title();
-    Q_NOREPLY void toggle();
+       QString album();
+       QString artist();
+       Q_NOREPLY void next();
+       Q_NOREPLY void prev();
+       Q_NOREPLY void stop();
+       QString title();
+       QString title_artist_album();
+       QString state();
+       QString albumart();
+       Q_NOREPLY void toggle();
+       Q_NOREPLY void pause();
+       Q_NOREPLY void playIfPaused();
+
+       void processBTSignal(QString, QString);
 Q_SIGNALS: // SIGNALS
+       void stateChanged();
+       void albumArt(QString path);
+private:
+       QTime _time;
 };
 
 #endif