Remove old proxy code

author: Alex Merry <dev@randomguy3.me.uk> 2011-10-28 14:26:27 +0200
committer: Alex Merry <dev@randomguy3.me.uk> 2011-10-28 14:26:27 +0200
commit: e49663a4e8a948186163216570265e7b288de286 (patch)
tree: 0bac6f6c8c63f21026bc3f5d3df2506a468269c6
parent: 8d241d7fdb1ede91fbc144d90c8ce2eacff06d71 (diff)
23 files changed, 0 insertions, 2361 deletions
diff --git a/dbus/1.0/generate.sh b/dbus/1.0/generate.sh
deleted file mode 100755
index 4be9e15..0000000
--- a/dbus/1.0/generate.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# Generates the QtDBus helper classes
-
-
-if [ "x$1" == "x--adaptors" ]; then
-	qdbusxml2cpp -N -i mpristypes.h \
-		     -c Mpris1RootAdaptor \
-		     -a root_adaptor org.freedesktop.MediaPlayer.root.xml
-	qdbusxml2cpp -N -i mpristypes.h \
-		     -c Mpris1PlayerAdaptor \
-		     -a player_adaptor org.freedesktop.MediaPlayer.player.xml
-	qdbusxml2cpp -N -i mpristypes.h \
-		     -c Mpris1TrackListAdaptor \
-		     -a tracklist_adaptor org.freedesktop.MediaPlayer.tracklist.xml
-else
-	qdbusxml2cpp -N -i mpristypes.h \
-		     -c Mpris1RootProxy \
-		     -p root_proxy org.freedesktop.MediaPlayer.root.xml
-	qdbusxml2cpp -N -i mpristypes.h \
-		     -c Mpris1PlayerProxy \
-		     -p player_proxy org.freedesktop.MediaPlayer.player.xml
-	qdbusxml2cpp -N -i mpristypes.h \
-		     -c Mpris1TrackListProxy \
-		     -p tracklist_proxy org.freedesktop.MediaPlayer.tracklist.xml
-fi
diff --git a/dbus/1.0/mpristypes.cpp b/dbus/1.0/mpristypes.cpp
deleted file mode 100644
index 16f0ead..0000000
--- a/dbus/1.0/mpristypes.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2008, 2009  Alex Merry <alex.merry@kdemail.net>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include "mpristypes.h"
-
-#include <QtDBus>
-
-QDBusArgument &operator<<(QDBusArgument &argument, const Mpris::Version &version)
-{
-    argument.beginStructure();
-    argument << version.major << version.minor;
-    argument.endStructure();
-    return argument;
-}
-
-const QDBusArgument &operator>>(const QDBusArgument &argument, Mpris::Version &version)
-{
-    argument.beginStructure();
-    argument >> version.major >> version.minor;
-    argument.endStructure();
-    return argument;
-}
-
-QDBusArgument &operator<<(QDBusArgument &argument, const Mpris::Status &status)
-{
-    argument.beginStructure();
-    argument << (qint32)status.play;
-    argument << (qint32)status.random;
-    argument << (qint32)status.trackRepeat;
-    argument << (qint32)status.playlistRepeat;
-    argument.endStructure();
-    return argument;
-}
-
-const QDBusArgument &operator>>(const QDBusArgument &argument, Mpris::Status &status)
-{
-    qint32 play, random, trackRepeat, playlistRepeat;
-
-    argument.beginStructure();
-    argument >> play;
-    argument >> random;
-    argument >> trackRepeat;
-    argument >> playlistRepeat;
-    argument.endStructure();
-
-    status.play = (Mpris::Status::PlayMode)play;
-    status.random = (Mpris::Status::RandomMode)random;
-    status.trackRepeat = (Mpris::Status::TrackRepeatMode)trackRepeat;
-    status.playlistRepeat = (Mpris::Status::PlaylistRepeatMode)playlistRepeat;
-
-    return argument;
-}
-
-void Mpris::registerTypes()
-{
-    qDBusRegisterMetaType<Mpris::Version>();
-    qDBusRegisterMetaType<Mpris::Status>();
-}
-
-// vim: sw=4 sts=4 et tw=100
diff --git a/dbus/1.0/mpristypes.h b/dbus/1.0/mpristypes.h
deleted file mode 100644
index 9df06dd..0000000
--- a/dbus/1.0/mpristypes.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright 2008, 2009  Alex Merry <alex.merry@kdemail.net>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef MPRISTYPES_H
-#define MPRISTYPES_H
-
-#include <QDBusArgument>
-#include <QFlags>
-
-namespace Mpris
-{
-    /**
-     * The bit values for the capabilities flags
-     */
-    enum Cap {
-        NO_CAPS               = 0,
-        CAN_GO_NEXT           = 1 << 0,
-        CAN_GO_PREV           = 1 << 1,
-        CAN_PAUSE             = 1 << 2,
-        CAN_PLAY              = 1 << 3,
-        CAN_SEEK              = 1 << 4,
-        CAN_PROVIDE_METADATA  = 1 << 5,
-        CAN_HAS_TRACKLIST     = 1 << 6,
-        ALL_KNOWN_CAPS        = (1 << 7) - 1
-    };
-    Q_DECLARE_FLAGS(Caps, Cap)
-
-
-    struct Version
-    {
-        quint16 major;
-        quint16 minor;
-    };
-
-
-    struct Status
-    {
-        enum PlayMode {
-            Playing = 0,
-            Paused = 1,
-            Stopped = 2
-        };
-
-        enum RandomMode {
-            Linear = 0,
-            Random = 1
-        };
-
-        enum TrackRepeatMode {
-            GoToNext = 0,
-            RepeatCurrent = 1
-        };
-
-        enum PlaylistRepeatMode {
-            StopWhenFinished = 0,
-            PlayForever = 1
-        };
-
-        Status(PlayMode _play = Stopped,
-               RandomMode _random = Linear,
-               TrackRepeatMode _trackRepeat = GoToNext,
-               PlaylistRepeatMode _playlistRepeat = StopWhenFinished)
-            : play(_play),
-              random(_random),
-              trackRepeat(_trackRepeat),
-              playlistRepeat(_playlistRepeat)
-        {
-        }
-        PlayMode           play;
-        RandomMode         random;
-        TrackRepeatMode    trackRepeat;
-        PlaylistRepeatMode playlistRepeat;
-    };
-
-    /**
-     * Registers the D-Bus types with the Qt metadata system.
-     *
-     * This MUST be called before using either Status or Version in any
-     * D-Bus calls (including making calls that return those types).
-     */
-    void registerTypes();
-} // namespace Mpris
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(Mpris::Caps)
-
-Q_DECLARE_METATYPE(Mpris::Version)
-
-Q_DECLARE_METATYPE(Mpris::Status)
-
-// Marshall the Mpris::Version data into a D-BUS argument
-QDBusArgument &operator<<(QDBusArgument &argument, const Mpris::Version &version);
-// Retrieve the Mpris::Version data from the D-BUS argument
-const QDBusArgument &operator>>(const QDBusArgument &argument, Mpris::Version &version);
-
-// Marshall the Mpris::Status data into a D-BUS argument
-QDBusArgument &operator<<(QDBusArgument &argument, const Mpris::Status &status);
-// Retrieve the Mpris::Status data from the D-BUS argument
-const QDBusArgument &operator>>(const QDBusArgument &argument, Mpris::Status &status);
-
-#endif // MPRISTYPES_H
diff --git a/dbus/1.0/org.freedesktop.MediaPlayer.player.xml b/dbus/1.0/org.freedesktop.MediaPlayer.player.xml
deleted file mode 100644
index 2ff3ca0..0000000
--- a/dbus/1.0/org.freedesktop.MediaPlayer.player.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!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.freedesktop.MediaPlayer">
-
-    <method name="Next">
-    </method>
-
-    <method name="Prev">
-    </method>
-
-    <method name="Pause">
-    </method>
-
-    <method name="Stop">
-    </method>
-
-    <method name="Play">
-    </method>
-
-    <method name="Repeat">
-        <arg type="b" direction="in" />
-    </method>
-
-    <method name="GetStatus">
-        <arg type="(iiii)" direction="out"/>
-        <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="Mpris::Status" />
-    </method>
-
-    <method name="GetMetadata">
-        <arg type="a{sv}" direction="out"/>
-        <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
-    </method>
-
-    <method name="GetCaps">
-        <arg type="i" direction="out" />
-    </method>
-
-    <method name="VolumeSet">
-        <arg type="i" direction="in"/>
-    </method>
-
-    <method name="VolumeGet">
-        <arg type="i" direction="out"/>
-    </method>
-
-    <method name="PositionSet">
-        <arg type="i" direction="in"/>
-    </method>
-
-    <method name="PositionGet">
-        <arg type="i" direction="out"/>
-    </method>
-
-    <signal name="TrackChange">
-        <arg type="a{sv}"/>
-        <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QVariantMap"/>
-    </signal>
-
-    <signal name="StatusChange">
-        <arg type="(iiii)"/>
-        <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="Mpris::Status"/>
-    </signal>
-
-    <signal name="CapsChange">
-        <arg type="i" />
-    </signal>
-
-  </interface>
-</node>
diff --git a/dbus/1.0/org.freedesktop.MediaPlayer.root.xml b/dbus/1.0/org.freedesktop.MediaPlayer.root.xml
deleted file mode 100644
index 4c698d6..0000000
--- a/dbus/1.0/org.freedesktop.MediaPlayer.root.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!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.freedesktop.MediaPlayer">
-        <method name="Identity">
-            <arg type="s" direction="out"/>
-        </method>
-
-        <method name="Quit">
-        </method>
-
-        <method name="MprisVersion">
-            <arg type="(qq)" direction="out"/>
-            <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="Mpris::Version"/>
-        </method>
-    </interface>
-</node>
diff --git a/dbus/1.0/org.freedesktop.MediaPlayer.tracklist.xml b/dbus/1.0/org.freedesktop.MediaPlayer.tracklist.xml
deleted file mode 100644
index e8cb127..0000000
--- a/dbus/1.0/org.freedesktop.MediaPlayer.tracklist.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<!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.freedesktop.MediaPlayer">
-
-    <method name="GetMetadata">
-        <arg type="i" direction="in" />
-        <arg type="a{sv}" direction="out" />
-        <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
-    </method>
-
-    <method name="GetCurrentTrack">
-        <arg type="i" direction="out" />
-    </method>
-
-    <method name="GetLength">
-        <arg type="i" direction="out" />
-    </method>
-
-    <method name="AddTrack">
-        <arg type="s" direction="in" />
-        <arg type="b" direction="in" />
-        <arg type="i" direction="out" />
-    </method>
-
-    <method name="DelTrack">
-        <arg type="i" />
-    </method>
-
-    <method name="SetLoop">
-        <arg type="b" />
-    </method>
-
-    <method name="SetRandom">
-        <arg type="b" />
-    </method>
-
-    <signal name="TrackListChange">
-        <arg type="i" />
-    </signal>
-
-  </interface>
-</node>
diff --git a/dbus/1.0/player_proxy.cpp b/dbus/1.0/player_proxy.cpp
deleted file mode 100644
index 8a25132..0000000
--- a/dbus/1.0/player_proxy.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -N -i mpristypes.h -c Mpris1PlayerProxy -p player_proxy org.freedesktop.MediaPlayer.player.xml
- *
- * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * This file may have been hand-edited. Look for HAND-EDIT comments
- * before re-generating it.
- */
-
-#include "player_proxy.h"
-
-/*
- * Implementation of interface class Mpris1PlayerProxy
- */
-
-Mpris1PlayerProxy::Mpris1PlayerProxy(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-Mpris1PlayerProxy::~Mpris1PlayerProxy()
-{
-}
-
diff --git a/dbus/1.0/player_proxy.h b/dbus/1.0/player_proxy.h
deleted file mode 100644
index e9673db..0000000
--- a/dbus/1.0/player_proxy.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -N -i mpristypes.h -c Mpris1PlayerProxy -p player_proxy org.freedesktop.MediaPlayer.player.xml
- *
- * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef PLAYER_PROXY_H_1281721680
-#define PLAYER_PROXY_H_1281721680
-
-#include <QtCore/QObject>
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-#include <QtDBus/QtDBus>
-#include "mpristypes.h"
-
-/*
- * Proxy class for interface org.freedesktop.MediaPlayer
- */
-class Mpris1PlayerProxy: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.freedesktop.MediaPlayer"; }
-
-public:
-    Mpris1PlayerProxy(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-
-    ~Mpris1PlayerProxy();
-
-public Q_SLOTS: // METHODS
-    inline QDBusPendingReply<int> GetCaps()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("GetCaps"), argumentList);
-    }
-
-    inline QDBusPendingReply<QVariantMap> GetMetadata()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("GetMetadata"), argumentList);
-    }
-
-    inline QDBusPendingReply<Mpris::Status> GetStatus()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("GetStatus"), argumentList);
-    }
-
-    inline QDBusPendingReply<> Next()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("Next"), argumentList);
-    }
-
-    inline QDBusPendingReply<> Pause()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("Pause"), argumentList);
-    }
-
-    inline QDBusPendingReply<> Play()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("Play"), argumentList);
-    }
-
-    inline QDBusPendingReply<int> PositionGet()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("PositionGet"), argumentList);
-    }
-
-    inline QDBusPendingReply<> PositionSet(int in0)
-    {
-        QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0);
-        return asyncCallWithArgumentList(QLatin1String("PositionSet"), argumentList);
-    }
-
-    inline QDBusPendingReply<> Prev()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("Prev"), argumentList);
-    }
-
-    inline QDBusPendingReply<> Repeat(bool in0)
-    {
-        QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0);
-        return asyncCallWithArgumentList(QLatin1String("Repeat"), argumentList);
-    }
-
-    inline QDBusPendingReply<> Stop()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("Stop"), argumentList);
-    }
-
-    inline QDBusPendingReply<int> VolumeGet()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("VolumeGet"), argumentList);
-    }
-
-    inline QDBusPendingReply<> VolumeSet(int in0)
-    {
-        QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0);
-        return asyncCallWithArgumentList(QLatin1String("VolumeSet"), argumentList);
-    }
-
-Q_SIGNALS: // SIGNALS
-    void CapsChange(int in0);
-    void StatusChange(Mpris::Status in0);
-    void TrackChange(const QVariantMap &in0);
-};
-
-#endif
diff --git a/dbus/1.0/root_proxy.cpp b/dbus/1.0/root_proxy.cpp
deleted file mode 100644
index 25d2e6e..0000000
--- a/dbus/1.0/root_proxy.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -N -i mpristypes.h -c Mpris1RootProxy -p root_proxy org.freedesktop.MediaPlayer.root.xml
- *
- * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * This file may have been hand-edited. Look for HAND-EDIT comments
- * before re-generating it.
- */
-
-#include "root_proxy.h"
-
-/*
- * Implementation of interface class Mpris1RootProxy
- */
-
-Mpris1RootProxy::Mpris1RootProxy(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-Mpris1RootProxy::~Mpris1RootProxy()
-{
-}
-
diff --git a/dbus/1.0/root_proxy.h b/dbus/1.0/root_proxy.h
deleted file mode 100644
index c808db2..0000000
--- a/dbus/1.0/root_proxy.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -N -i mpristypes.h -c Mpris1RootProxy -p root_proxy org.freedesktop.MediaPlayer.root.xml
- *
- * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef ROOT_PROXY_H_1281721680
-#define ROOT_PROXY_H_1281721680
-
-#include <QtCore/QObject>
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-#include <QtDBus/QtDBus>
-#include "mpristypes.h"
-
-/*
- * Proxy class for interface org.freedesktop.MediaPlayer
- */
-class Mpris1RootProxy: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.freedesktop.MediaPlayer"; }
-
-public:
-    Mpris1RootProxy(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-
-    ~Mpris1RootProxy();
-
-public Q_SLOTS: // METHODS
-    inline QDBusPendingReply<QString> Identity()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("Identity"), argumentList);
-    }
-
-    inline QDBusPendingReply<Mpris::Version> MprisVersion()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("MprisVersion"), argumentList);
-    }
-
-    inline QDBusPendingReply<> Quit()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("Quit"), argumentList);
-    }
-
-Q_SIGNALS: // SIGNALS
-};
-
-#endif
diff --git a/dbus/1.0/tracklist_proxy.cpp b/dbus/1.0/tracklist_proxy.cpp
deleted file mode 100644
index b057218..0000000
--- a/dbus/1.0/tracklist_proxy.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -N -i mpristypes.h -c Mpris1TrackListProxy -p tracklist_proxy org.freedesktop.MediaPlayer.tracklist.xml
- *
- * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * This file may have been hand-edited. Look for HAND-EDIT comments
- * before re-generating it.
- */
-
-#include "tracklist_proxy.h"
-
-/*
- * Implementation of interface class Mpris1TrackListProxy
- */
-
-Mpris1TrackListProxy::Mpris1TrackListProxy(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-Mpris1TrackListProxy::~Mpris1TrackListProxy()
-{
-}
-
diff --git a/dbus/1.0/tracklist_proxy.h b/dbus/1.0/tracklist_proxy.h
deleted file mode 100644
index 400d0b2..0000000
--- a/dbus/1.0/tracklist_proxy.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -N -i mpristypes.h -c Mpris1TrackListProxy -p tracklist_proxy org.freedesktop.MediaPlayer.tracklist.xml
- *
- * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef TRACKLIST_PROXY_H_1281721680
-#define TRACKLIST_PROXY_H_1281721680
-
-#include <QtCore/QObject>
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-#include <QtDBus/QtDBus>
-#include "mpristypes.h"
-
-/*
- * Proxy class for interface org.freedesktop.MediaPlayer
- */
-class Mpris1TrackListProxy: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.freedesktop.MediaPlayer"; }
-
-public:
-    Mpris1TrackListProxy(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-
-    ~Mpris1TrackListProxy();
-
-public Q_SLOTS: // METHODS
-    inline QDBusPendingReply<int> AddTrack(const QString &in0, bool in1)
-    {
-        QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0) << qVariantFromValue(in1);
-        return asyncCallWithArgumentList(QLatin1String("AddTrack"), argumentList);
-    }
-
-    inline QDBusPendingReply<> DelTrack(int in0)
-    {
-        QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0);
-        return asyncCallWithArgumentList(QLatin1String("DelTrack"), argumentList);
-    }
-
-    inline QDBusPendingReply<int> GetCurrentTrack()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("GetCurrentTrack"), argumentList);
-    }
-
-    inline QDBusPendingReply<int> GetLength()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("GetLength"), argumentList);
-    }
-
-    inline QDBusPendingReply<QVariantMap> GetMetadata(int in0)
-    {
-        QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0);
-        return asyncCallWithArgumentList(QLatin1String("GetMetadata"), argumentList);
-    }
-
-    inline QDBusPendingReply<> SetLoop(bool in0)
-    {
-        QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0);
-        return asyncCallWithArgumentList(QLatin1String("SetLoop"), argumentList);
-    }
-
-    inline QDBusPendingReply<> SetRandom(bool in0)
-    {
-        QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0);
-        return asyncCallWithArgumentList(QLatin1String("SetRandom"), argumentList);
-    }
-
-Q_SIGNALS: // SIGNALS
-    void TrackListChange(int in0);
-};
-
-#endif
diff --git a/dbus/2.0/Player_Node.xml b/dbus/2.0/Player_Node.xml
deleted file mode 100644
index 801751f..0000000
--- a/dbus/2.0/Player_Node.xml
+++ /dev/null
@@ -1,736 +0,0 @@
-<?xml version="1.0" ?>
-<node name="/Player_Node" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.mpris.MediaPlayer2.Player">
-
-    <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-      <p>
-        This interface implements the methods for querying and providing basic
-        control over what is currently playing.
-      </p>
-    </tp:docstring>
-
-    <tp:enum name="Playback_Status" tp:name-for-bindings="Playback_Status" type="s">
-      <tp:enumvalue suffix="Playing" value="Playing">
-        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-          <p>A track is currently playing.</p>
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="Paused" value="Paused">
-        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-          <p>A track is currently paused.</p>
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="Stopped" value="Stopped">
-        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-          <p>There is no track currently playing.</p>
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>A playback state.</p>
-      </tp:docstring>
-    </tp:enum>
-
-    <tp:enum name="Loop_Status" tp:name-for-bindings="Loop_Status" type="s">
-      <tp:enumvalue suffix="None" value="None">
-        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-          <p>The playback will stop when there are no more tracks to play</p>
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="Track" value="Track">
-        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-          <p>The current track will start again from the begining once it has finished playing</p>
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="Playlist" value="Playlist">
-        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-          <p>The playback loops through a list of tracks</p>
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>A repeat / loop status</p>
-      </tp:docstring>
-    </tp:enum>
-
-    <tp:simple-type name="Track_Id" type="o" array-name="Track_Id_List">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Unique track identifier.</p>
-        <p>
-          If the media player implements the TrackList interface and allows
-          the same track to appear multiple times in the tracklist,
-          this must be unique within the scope of the tracklist.
-        </p>
-        <p>
-          Note that this should be a valid D-Bus object id, although clients
-          should not assume that any object is actually exported with any
-          interfaces at that path.
-        </p>
-        <tp:rationale>
-          <p>
-            This is a D-Bus object id as that is the definitive way to have
-            unique identifiers on D-Bus.  It also allows for future optional
-            expansions to the specification where tracks are exported to D-Bus
-            with an interface similar to org.gnome.UPnP.MediaItem2.
-          </p>
-        </tp:rationale>
-      </tp:docstring>
-    </tp:simple-type>
-
-    <tp:simple-type name="Playback_Rate" type="d">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>A playback rate</p>
-        <p>
-          This is a multiplier, so a value of 0.5 indicates that playback is
-          happening at half speed, while 1.5 means that 1.5 seconds of "track time"
-          is consumed every second.
-        </p>
-      </tp:docstring>
-    </tp:simple-type>
-
-    <tp:simple-type name="Volume" type="d">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Audio volume level</p>
-        <ul>
-          <li>0.0 means mute.</li>
-          <li>1.0 is a sensible maximum volume level (ex: 0dB).</li>
-        </ul>
-        <p>
-          Note that the volume may be higher than 1.0, although generally
-          clients should not attempt to set it above 1.0.
-        </p>
-      </tp:docstring>
-    </tp:simple-type>
-
-    <tp:simple-type name="Time_In_Us" type="x">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Time in microseconds.</p>
-      </tp:docstring>
-    </tp:simple-type>
-
-    <method name="Next" tp:name-for-bindings="Next">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Skips to the next track in the tracklist.</p>
-        <p>
-          If there is no next track (and endless playback and track
-          repeat are both off), stop playback.
-        </p>
-        <p>If playback is paused or stopped, it remains that way.</p>
-        <p>
-          If <tp:member-ref>CanGoNext</tp:member-ref> is
-          <strong>false</strong>, attempting to call this method should have
-          no effect.
-        </p>
-      </tp:docstring>
-    </method>
-
-    <method name="Previous" tp:name-for-bindings="Previous">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Skips to the previous track in the tracklist.</p>
-        <p>
-          If there is no previous track (and endless playback and track
-          repeat are both off), stop playback.
-        </p>
-        <p>If playback is paused or stopped, it remains that way.</p>
-        <p>
-          If <tp:member-ref>CanGoPrevious</tp:member-ref> is
-          <strong>false</strong>, attempting to call this method should have
-          no effect.
-        </p>
-      </tp:docstring>
-    </method>
-
-    <method name="Pause" tp:name-for-bindings="Pause">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Pauses playback.</p>
-        <p>If playback is already paused, this has no effect.</p>
-        <p>
-          Calling Play after this should cause playback to start again
-          from the same position.
-        </p>
-        <p>
-          If <tp:member-ref>CanPause</tp:member-ref> is
-          <strong>false</strong>, attempting to call this method should have
-          no effect.
-        </p>
-      </tp:docstring>
-    </method>
-
-    <method name="PlayPause" tp:name-for-bindings="PlayPause">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Pauses playback.</p>
-        <p>If playback is already paused, resumes playback.</p>
-        <p>If playback is stopped, starts playback.</p>
-        <p>
-          If <tp:member-ref>CanPause</tp:member-ref> is
-          <strong>false</strong>, attempting to call this method should have
-          no effect and raise an error.
-        </p>
-      </tp:docstring>
-    </method>
-
-    <method name="Stop" tp:name-for-bindings="Stop">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Stops playback.</p>
-        <p>If playback is already stopped, this has no effect.</p>
-        <p>
-          Calling Play after this should cause playback to
-          start again from the beginning of the track.
-        </p>
-        <p>
-          If <tp:member-ref>CanControl</tp:member-ref> is
-          <strong>false</strong>, attempting to call this method should have
-          no effect and raise an error.
-        </p>
-      </tp:docstring>
-    </method>
-
-    <method name="Play" tp:name-for-bindings="Play">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Starts or resumes playback.</p>
-        <p>If already playing, this has no effect.</p>
-        <p>If there is no track to play, this has no effect.</p>
-        <p>
-          If <tp:member-ref>CanPlay</tp:member-ref> is
-          <strong>false</strong>, attempting to call this method should have
-          no effect.
-        </p>
-      </tp:docstring>
-    </method>
-
-    <method name="Seek" tp:name-for-bindings="Seek">
-      <arg direction="in" type="x" name="Offset" tp:type="Time_In_Us">
-        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-          <p>The number of microseconds to seek forward.</p>
-        </tp:docstring>
-      </arg>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>
-          Seeks forward in the current track by the specified number
-          of microseconds.
-        </p>
-        <p>
-          A negative value seeks back. If this would mean seeking
-          back further than the start of the track, the position
-          is set to 0.
-        </p>
-        <p>
-          If the value passed in would mean seeking beyond the end
-          of the track, acts like a call to Next.
-        </p>
-        <p>
-          If the <tp:member-ref>CanSeek</tp:member-ref> property is false,
-          this has no effect.
-        </p>
-      </tp:docstring>
-    </method>
-
-    <method name="SetPosition" tp:name-for-bindings="Set_Position">
-      <arg direction="in" type="o" tp:type="Track_Id" name="TrackId">
-        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-          <p>The currently playing track's identifier.</p>
-          <p>
-            If this does not match the id of the currently-playing track,
-            the call is ignored as "stale".
-          </p>
-        </tp:docstring>
-      </arg>
-      <arg direction="in" type="x" tp:type="Time_In_Us" name="Position">
-        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-          <p>Track position in microseconds.</p>
-          <p>This must be between 0 and &lt;track_length&gt;.</p>
-        </tp:docstring>
-      </arg>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Sets the current track position in microseconds.</p>
-        <p>If the Position argument is less than 0, do nothing.</p>
-        <p>
-          If the Position argument is greater than the track length,
-          do nothing.
-        </p>
-        <p>
-          If the <tp:member-ref>CanSeek</tp:member-ref> property is false,
-          this has no effect.
-        </p>
-        <tp:rationale>
-          <p>
-            The reason for having this method, rather than making
-            <tp:member-ref>Position</tp:member-ref> writable, is to include
-            the TrackId argument to avoid race conditions where a client tries
-            to seek to a position when the track has already changed.
-          </p>
-        </tp:rationale>
-      </tp:docstring>
-    </method>
-
-    <method name="OpenUri" tp:name-for-bindings="Open_Uri">
-      <arg direction="in" type="s" tp:type="Uri" name="Uri">
-        <tp:docstring>
-          <p>
-            Uri of the track to load. Its uri scheme should be an element of the
-            <literal>org.mpris.MediaPlayer2.SupportedUriSchemes</literal>
-            property and the mime-type should match one of the elements of the
-            <literal>org.mpris.MediaPlayer2.SupportedMimeTypes</literal>.
-          </p>
-        </tp:docstring>
-      </arg>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Opens the Uri given as an argument</p>
-        <p>If the playback is stopped, starts playing</p>
-        <p>
-          If the uri scheme or the mime-type of the uri to open is not supported,
-          this method does nothing and may raise an error.
-        </p>
-        <p>Clients should not assume that the Uri has been opened as soon as this
-           method returns. They should wait until the trackid field in the
-           <tp:member-ref>Metadata</tp:member-ref> property changes.
-        </p>
-        <p>
-          If the media player implements the TrackList interface, then the
-          opened track should be made part of the tracklist, the
-          <literal>org.mpris.MediaPlayer2.TrackList.TrackAdded</literal> or
-          <literal>org.mpris.MediaPlayer2.TrackList.TrackListReplaced</literal>
-          signal should be fired, as well as the
-          <literal>org.freedesktop.DBus.Properties.PropertiesChanged</literal>
-          signal on the tracklist interface.
-        </p>
-      </tp:docstring>
-    </method>
-
-    <property name="PlaybackStatus" tp:name-for-bindings="Playback_Status" type="s" tp:type="Playback_Status" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>The current playback status.</p>
-        <p>
-          May be "Playing", "Paused" or "Stopped".
-        </p>
-        <p>
-          When this property changes, the
-          <literal>org.freedesktop.DBus.Properties.PropertiesChanged</literal>
-          signal is emited with the new value.
-        </p>
-      </tp:docstring>
-    </property>
-
-    <property name="LoopStatus" type="s" access="readwrite"
-              tp:name-for-bindings="Loop_Status" tp:type="Loop_Status">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>The current loop / repeat status</p>
-        <p>May be:
-          <ul>
-            <li>"None" if the playback will stop when there are no more tracks to play</li>
-            <li>"Track" if the current track will start again from the begining once it has finished playing</li>
-            <li>"Playlist" if the playback loops through a list of tracks</li>
-          </ul>
-        </p>
-        <p>
-          When this property changes, the
-          <literal>org.freedesktop.DBus.Properties.PropertiesChanged</literal>
-          signal is emited with the new value.
-        </p>
-        <p>
-          This property is optional, and clients should deal with NotSupported
-          errors gracefully.
-        </p>
-        <p>
-          If <tp:member-ref>CanControl</tp:member-ref> is
-          <strong>false</strong>, attempting to set this property should have
-          no effect and raise an error.
-        </p>
-      </tp:docstring>
-    </property>
-
-    <property name="Rate" tp:name-for-bindings="Rate" type="d" tp:type="Playback_Rate" access="readwrite">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>The current playback rate.</p>
-        <p>
-          The value must fall in the range described by
-          <tp:member-ref>MinimumRate</tp:member-ref> and
-          <tp:member-ref>MaximumRate</tp:member-ref>, and must not be 0.0.  If
-          playback is paused, the <tp:member-ref>PlaybackStatus</tp:member-ref>
-          property should be used to indicate this.  A value of 0.0 should not
-          be set by the client.  If it is, the media player should act as
-          though <tp:member-ref>Pause</tp:member-ref> was called.
-        </p>
-        <p>
-          If the media player has no ability to play at speeds other than the
-          normal playback rate, this must still be implemented, and must
-          return 1.0.  The <tp:member-ref>MinimumRate</tp:member-ref> and
-          <tp:member-ref>MaximumRate</tp:member-ref> properties must also be
-          set to 1.0.
-        </p>
-        <p>
-          Not all values may be accepted by the media player.  It is left to
-          media player implementations to decide how to deal with values they
-          cannot use; they may either ignore them or pick a "best fit" value.
-          Clients are recommended to only use sensible fractions or multiples
-          of 1 (eg: 0.5, 0.25, 1.5, 2.0, etc).
-        </p>
-        <p>
-          When this property changes, the
-          <literal>org.freedesktop.DBus.Properties.PropertiesChanged</literal>
-          signal is emited with the new value.
-        </p>
-        <tp:rationale>
-          <p>
-            This allows clients to display (reasonably) accurate progress bars
-            without having to regularly query the media player for the current
-            position.
-          </p>
-        </tp:rationale>
-      </tp:docstring>
-    </property>
-
-    <property name="Shuffle" tp:name-for-bindings="Shuffle" type="b" access="readwrite">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>
-          A value of <strong>false</strong> indicates that playback is
-          progressing linearly through a playlist, while <strong>true</strong>
-          means playback is progressing through a playlist in some other order.
-        </p>
-        <p>
-          When this property changes, the
-          <literal>org.freedesktop.DBus.Properties.PropertiesChanged</literal>
-          signal is emited with the new value.
-        </p>
-        <p>
-          This property is optional, and clients should deal with NotSupported
-          errors gracefully.
-        </p>
-        <p>
-          If <tp:member-ref>CanControl</tp:member-ref> is
-          <strong>false</strong>, attempting to set this property should have
-          no effect and raise an error.
-        </p>
-      </tp:docstring>
-    </property>
-
-    <property name="Metadata" tp:name-for-bindings="Metadata" type="a{sv}" tp:type="Metadata_Map" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName" value="QVariantMap"/>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>The metadata of the current element.</p>
-        <p>
-          If there is a current track, this must have a "trackid" entry
-          at the very least, which contains a string that uniquely identifies
-          this track.
-        </p>
-        <p>
-          If the media player implements the TrackList interface and allows
-          the same track to appear multiple times in the tracklist, the
-          "trackid" entry must be unique within the scope of the tracklist.
-        </p>
-        <p>
-          Guidelines for other field names are at
-          <a href="http://wiki.xmms2.xmms.se/wiki/MPRIS_Metadata">
-            http://wiki.xmms2.xmms.se/wiki/MPRIS_Metadata
-          </a>.
-        </p>
-        <p>
-          When this property changes, the
-          <literal>org.freedesktop.DBus.Properties.PropertiesChanged</literal>
-          signal is emited with the new value.
-        </p>
-      </tp:docstring>
-    </property>
-
-    <property name="Volume" type="d" tp:type="Volume" tp:name-for-bindings="Volume" access="readwrite">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>The volume level.</p>
-        <p>
-          When setting, if a negative value is passed, the volume
-          should be set to 0.0.
-        </p>
-        <p>
-          If <tp:member-ref>CanControl</tp:member-ref> is
-          <strong>false</strong>, attempting to set this property should have
-          no effect and raise an error.
-        </p>
-      </tp:docstring>
-    </property>
-
-    <property name="Position" type="x" tp:type="Time_In_Us" tp:name-for-bindings="Position" access="read">
-        <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-          <p>
-            The current track position in microseconds, between 0 and
-            the 'length' metadata entry (see Metadata).
-          </p>
-          <p>
-            Note: If the media player allows it, the current playback position
-            can be changed either the SetPosition method or the Seek method on
-            this interface.  If this is not the case, the
-            <tp:member-ref>CanSeek</tp:member-ref> property is false, and
-            setting this property has no effect and can raise an error.
-          </p>
-          <p>
-            If the playback progresses in a way that is inconstistant with the
-            <tp:member-ref>Rate</tp:member-ref> property, the
-            <tp:member-ref>Seeked</tp:member-ref> signal is emited.
-          </p>
-          <p>
-            The <literal>org.freedesktop.DBus.Properties.PropertiesChanged</literal>
-            is <strong>not</strong> emited when this property changes.
-          </p>
-        </tp:docstring>
-    </property>
-
-    <property name="MinimumRate" tp:name-for-bindings="Minimum_Rate" type="d" tp:type="Playback_Rate" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>
-          The minimum value which the <tp:member-ref>Rate</tp:member-ref>
-          property can take.
-          Clients should not attempt to set the
-          <tp:member-ref>Rate</tp:member-ref> property below this value.
-        </p>
-        <p>
-          Note that even if this value is 0.0 or negative, clients should
-          not attempt to set the <tp:member-ref>Rate</tp:member-ref> property
-          to 0.0.
-        </p>
-        <p>This value should always be 1.0 or less.</p>
-        <p>
-          When this property changes, the
-          <literal>org.freedesktop.DBus.Properties.PropertiesChanged</literal>
-          signal is emited with the new value.
-        </p>
-      </tp:docstring>
-    </property>
-
-    <property name="MaximumRate" tp:name-for-bindings="Maximum_Rate" type="d" tp:type="Playback_Rate" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>
-          The maximum value which the <tp:member-ref>Rate</tp:member-ref>
-          property can take.
-          Clients should not attempt to set the
-          <tp:member-ref>Rate</tp:member-ref> property above this value.
-        </p>
-        <p>
-          This value should always be 1.0 or greater.
-        </p>
-        <p>
-          When this property changes, the
-          <literal>org.freedesktop.DBus.Properties.PropertiesChanged</literal>
-          signal is emited with the new value.
-        </p>
-      </tp:docstring>
-    </property>
-
-    <property name="CanGoNext" tp:name-for-bindings="Can_Go_Next" type="b" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>
-          Whether the client can call the <tp:member-ref>Next</tp:member-ref>
-          method on this interface and expect the current track to change.
-        </p>
-        <p>
-          When this property changes, the
-          <literal>org.freedesktop.DBus.Properties.PropertiesChanged</literal>
-          signal is emited with the new value.
-        </p>
-        <p>
-          If <tp:member-ref>CanControl</tp:member-ref> is
-          <strong>false</strong>, this property should also be
-          <strong>false</strong>.
-        </p>
-        <p>
-          If <tp:member-ref>CanControl</tp:member-ref> is
-          <strong>false</strong>, this property should also be
-          <strong>false</strong>.
-        </p>
-        <tp:rationale>
-          <p>
-            Even when playback can generally be controlled, there may not
-            always be a next track to move to.
-          </p>
-        </tp:rationale>
-      </tp:docstring>
-    </property>
-
-    <property name="CanGoPrevious" tp:name-for-bindings="Can_Go_Previous" type="b" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>
-          Whether the client can call the
-          <tp:member-ref>Previous</tp:member-ref> method on this interface and
-          expect the current track to change.
-        </p>
-        <p>
-          When this property changes, the
-          <literal>org.freedesktop.DBus.Properties.PropertiesChanged</literal>
-          signal is emited with the new value.
-        </p>
-        <p>
-          If <tp:member-ref>CanControl</tp:member-ref> is
-          <strong>false</strong>, this property should also be
-          <strong>false</strong>.
-        </p>
-        <p>
-          If <tp:member-ref>CanControl</tp:member-ref> is
-          <strong>false</strong>, this property should also be
-          <strong>false</strong>.
-        </p>
-        <tp:rationale>
-          <p>
-            Even when playback can generally be controlled, there may not
-            always be a next previous to move to.
-          </p>
-        </tp:rationale>
-
-      </tp:docstring>
-    </property>
-
-    <property name="CanPlay" tp:name-for-bindings="Can_Play" type="b" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Whether playback can be started using
-           <tp:member-ref>Play</tp:member-ref> or
-           <tp:member-ref>PlayPause</tp:member-ref>.
-        </p>
-        <p>
-          Note that this is related to whether there is a "current track": the
-          value should not depend on whether the track is currently paused or
-          playing.  In fact, if a track is currently playing
-          <tp:member-ref>CanControl</tp:member-ref> is <strong>true</strong>),
-          this should be <strong>true</strong>.
-        </p>
-        <p>
-          When this property changes, the
-          <literal>org.freedesktop.DBus.Properties.PropertiesChanged</literal>
-          signal is emited with the new value.
-        </p>
-        <p>
-          If <tp:member-ref>CanControl</tp:member-ref> is
-          <strong>false</strong>, this property should also be
-          <strong>false</strong>.
-        </p>
-        <tp:rationale>
-          <p>
-            Even when playback can generally be controlled, it may not be
-            possible to enter a "playing" state, for example if there is no
-            "current track".
-          </p>
-        </tp:rationale>
-      </tp:docstring>
-    </property>
-
-    <property name="CanPause" tp:name-for-bindings="Can_Pause" type="b" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Whether playback can be paused using
-           <tp:member-ref>Pause</tp:member-ref> or
-           <tp:member-ref>PlayPause</tp:member-ref>.
-        </p>
-        <p>
-          Note that this is an intrinsic property of the current track: its
-          value should not depend on whether the track is currently paused or
-          playing.  In fact, if playback is currently paused (and
-          <tp:member-ref>CanControl</tp:member-ref> is <strong>true</strong>),
-          this should be <strong>true</strong>.
-        </p>
-        <p>
-          When this property changes, the
-          <literal>org.freedesktop.DBus.Properties.PropertiesChanged</literal>
-          signal is emited with the new value.
-        </p>
-        <p>
-          If <tp:member-ref>CanControl</tp:member-ref> is
-          <strong>false</strong>, this property should also be
-          <strong>false</strong>.
-        </p>
-        <tp:rationale>
-          <p>
-            Not all media is pausable: it may not be possible to pause some
-            streamed media, for example.
-          </p>
-        </tp:rationale>
-      </tp:docstring>
-    </property>
-
-    <property name="CanSeek" tp:name-for-bindings="Can_Seek" type="b" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>
-          Whether the client can control the playback position using
-          <tp:member-ref>Seek</tp:member-ref> and
-          <tp:member-ref>SetPosition</tp:member-ref>.  This may be different for
-          different tracks.
-        </p>
-        <p>
-          When this property changes, the
-          <literal>org.freedesktop.DBus.Properties.PropertiesChanged</literal>
-          signal is emited with the new value.
-        </p>
-        <p>
-          If <tp:member-ref>CanControl</tp:member-ref> is
-          <strong>false</strong>, this property should also be
-          <strong>false</strong>.
-        </p>
-        <tp:rationale>
-          <p>
-            Not all media is seekable: it may not be possible to seek when
-            playing some streamed media, for example.
-          </p>
-        </tp:rationale>
-      </tp:docstring>
-    </property>
-
-    <property name="CanControl" tp:name-for-bindings="Can_Control" type="b" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Whether the media player may be controlled over this interface.</p>
-        <p>
-          This property is not expected to change, as it describes an intrinsic
-          capability of the implementation.
-        </p>
-        <p>
-          If this is <strong>false</strong>, clients should assume that all
-          properties on this interface are read-only (and will raise errors
-          if writing to them is attempted); all methods are not implemented
-          and all other properties starting with "Can" are also
-          <strong>false</strong>.
-        </p>
-        <tp:rationale>
-          <p>
-            This allows clients to determine whether to present and enable
-            controls to the user in advance of attempting to call methods
-            and write to properties.
-          </p>
-        </tp:rationale>
-      </tp:docstring>
-    </property>
-
-    <signal name="Seeked" tp:name-for-bindings="Seeked">
-      <arg name="Position" type="x" tp:type="Time_In_Us">
-        <tp:docstring>
-          <p>The new position, in microseconds.</p>
-        </tp:docstring>
-      </arg>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>
-          Indicates that the track position has changed in a way that is
-          inconsistant with the current playing state.
-        </p>
-        <p>When this signal is not received, clients should assume that :</p>
-        <ul>
-          <li>
-            When playing, the position progresses according to the rate property.
-          </li>
-          <li>When paused, it remains constant.</li>
-        </ul>
-        <p>
-          This signal does not need to be emitted when playback starts
-          or when the track changes, unless the track is starting at an
-          unexpected position. An expected position would be the last
-          known one when going from Paused to Playing, and 0 when going from
-          Stopped to Playing.
-        </p>
-      </tp:docstring>
-    </signal>
-
-  </interface>
-</node>
-<!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/dbus/2.0/Root_Node.xml b/dbus/2.0/Root_Node.xml
deleted file mode 100644
index 79f5647..0000000
--- a/dbus/2.0/Root_Node.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" ?>
-<node name="/Root_Node" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.mpris.MediaPlayer2">
-    <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/>
-
-    <tp:docstring>
-      Every time the value of this interface's properties changes, the
-      <literal>org.freedesktop.DBus.Properties.PropertiesChanged</literal>
-      signal is emited with the new values.
-    </tp:docstring>
-
-    <method name="Raise" tp:name-for-bindings="Raise">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>
-          Brings the media player's user interface to the front using any
-          appropriate mechanism available.
-        </p>
-        <p>
-          The media player may be unable to control how its user interface
-          is displayed, or it may not have a graphical user interface at all.
-          In this case, the <tp:member-ref>CanRaise</tp:member-ref> property is
-          <strong>false</strong> and this method does nothing.
-        </p>
-      </tp:docstring>
-    </method>
-
-    <method name="Quit" tp:name-for-bindings="Quit">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Causes the media player to stop running.</p>
-        <p>
-          The media player may refuse to allow clients to shut it down.
-          In this case, the <tp:member-ref>CanQuit</tp:member-ref> property is
-          <strong>false</strong> and this method does nothing.
-        </p>
-        <p>
-          Note: Media players which can be D-Bus activated, or for which there is
-          no sensibly easy way to terminate a running instance (via the main
-          interface or a notification area icon for example) should allow clients
-          to use this method. Otherwise, it should not be needed.
-        </p>
-        <p>If the media player does not have a UI, this must be implemented</p>
-      </tp:docstring>
-    </method>
-
-    <property name="CanQuit" type="b" tp:name-for-bindings="Can_Quit" access="read">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>
-          If <strong>false</strong>, calling
-          <tp:member-ref>Quit</tp:member-ref> will have no effect, and may
-          raise a NotSupported error.  If <strong>true</strong>, calling
-          <tp:member-ref>Quit</tp:member-ref> will cause the media application
-          to attempt to quit (although it may still be prevented from quitting
-          by the user, for example).
-        </p>
-      </tp:docstring>
-    </property>
-
-    <property name="CanRaise" type="b" tp:name-for-bindings="Can_Raise" access="read">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>
-          If <strong>false</strong>, calling
-          <tp:member-ref>Raise</tp:member-ref> will have no effect, and may
-          raise a NotSupported error.  If <strong>true</strong>, calling
-          <tp:member-ref>Raise</tp:member-ref> will cause the media application
-          to attempt to bring its user interface to the front, although it may
-          be prevented from doing so (by the window manager, for example).
-        </p>
-      </tp:docstring>
-    </property>
-
-    <property name="HasTrackList" type="b" tp:name-for-bindings="Has_TrackList" access="read">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>
-          Indicates whether the <strong>/org/mpris/MediaPlayer2</strong>
-          object implements the <strong>org.mpris.MediaPlayer2.TrackList</strong>
-          interface.
-        </p>
-      </tp:docstring>
-    </property>
-
-    <property name="Identity" type="s" tp:name-for-bindings="Identity" access="read">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>A friendly name to identify the media player to users.</p>
-        <p>This should usually match the name found in .desktop files</p>
-        <p>(eg: "VLC media player").</p>
-      </tp:docstring>
-    </property>
-
-    <property name="DesktopEntry" type="s" tp:name-for-bindings="Desktop_Entry" access="read">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>The basename of an installed .desktop file which complies with the <a href="http://standards.freedesktop.org/desktop-entry-spec/latest/">Desktop entry specification</a>,
-        with the ".desktop" extension stripped.</p>
-        <p>
-          Example: The desktop entry file is "/usr/share/applications/vlc.desktop",
-          and this property contains "vlc"
-        </p>
-        <p>This property is optional. Clients should handle its absence gracefully</p>
-      </tp:docstring>
-    </property>
-
-    <property name="SupportedUriSchemes" type="as" tp:name-for-bindings="Supported_Uri_Schemes" access="read">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>
-          The URI schemes supported by the media player.
-        </p>
-        <p>
-          This can be viewed as protocols supported by the player in almost
-          all cases.  Almost every media player will include support for the
-          "file" scheme.  Other common schemes are "http" and "rtsp".
-        </p>
-        <p>
-          Note that URI schemes should be lower-case.
-        </p>
-        <tp:rationale>
-          <p>
-            This is important for clients to know when using the editing
-            capabilities of the Playlist interface, for example.
-          </p>
-        </tp:rationale>
-      </tp:docstring>
-    </property>
-
-    <property name="SupportedMimeTypes" type="as" tp:name-for-bindings="Supported_Mime_Types" access="read">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>
-          The mime-types supported by the media player.
-        </p>
-        <p>
-          Mime-types should be in the standard format (eg: audio/mpeg or
-          application/ogg).
-        </p>
-        <tp:rationale>
-          <p>
-            This is important for clients to know when using the editing
-            capabilities of the Playlist interface, for example.
-          </p>
-        </tp:rationale>
-      </tp:docstring>
-    </property>
-
-  </interface>
-</node>
-<!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/dbus/2.0/TrackList_Node.xml b/dbus/2.0/TrackList_Node.xml
deleted file mode 100644
index 7cbc55f..0000000
--- a/dbus/2.0/TrackList_Node.xml
+++ /dev/null
@@ -1,294 +0,0 @@
-<?xml version="1.0" ?>
-<node name="/TrackList_Node" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.mpris.MediaPlayer2.TrackList">
-
-    <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-      <p>
-        Provides access to a short list of tracks which were recently played or
-        will be played shortly.
-        Example use cases are the list of tracks from the same album as the
-        currently playing song or the
-        <a href="http://projects.gnome.org/rhythmbox/">Rhythmbox</a> play queue.
-      </p>
-      <p>
-        Each track in the tracklist has a unique identifier.
-        The intention is that this uniquely identifies the track within
-        the scope of the tracklist. In particular, if a media item
-        (a particular music file, say) occurs twice in the track list, each
-        occurrence should have a different identifier. If a track is removed
-        from the middle of the playlist, it should not affect the track ids
-        of any other tracks in the tracklist.
-      </p>
-      <p>
-        As a result, the traditional track identifiers of URLs and position
-        in the playlist cannot be used. Any scheme which satisfies the
-        uniqueness requirements is valid, as clients should not make any
-        assumptions about the value of the track id beyond the fact
-        that it is a unique identifier.
-      </p>
-      <p>
-        Note that the (memory and processing) burden of implementing the
-        TrackList interface and maintaining unique track ids for the
-        playlist can be mitigated by only exposing a subset of the playlist when
-        it is very long (the 20 or so tracks around the currently playing
-        track, for example). This is a recommended practice as the tracklist
-        interface is not designed to enable browsing through a large list of tracks,
-        but rather to provide clients with context about the currently playing track.
-      </p>
-    </tp:docstring>
-
-    <tp:mapping name="Metadata_Map" array-name="Metadata_Map_List">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>A mapping from metadata attribute names to values.</p>
-        <p>
-          The <b>trackid</b> attribute must always be present.  This contains
-          a string that uniquely identifies the track within the scope of the
-          playlist.
-        </p>
-      </tp:docstring>
-      <tp:member type="s" name="Attribute">
-        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-          <p>
-            The name of the attribute; see
-            <a href="http://wiki.xmms2.xmms.se/wiki/MPRIS_Metadata">
-              http://wiki.xmms2.xmms.se/wiki/MPRIS_Metadata
-            </a> for guidelines on names to use.
-          </p>
-        </tp:docstring>
-      </tp:member>
-      <tp:member type="v" name="Value">
-        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-          <p>The value of the attribute, in the most appropriate format.</p>
-        </tp:docstring>
-      </tp:member>
-    </tp:mapping>
-
-    <tp:simple-type name="Uri" type="s">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>A unique resource identifier.</p>
-      </tp:docstring>
-    </tp:simple-type>
-
-    <method name="GetTracksMetadata" tp:name-for-bindings="Get_Tracks_Metadata">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
-      <arg direction="in" name="TrackIds" type="ao" tp:type="Track_Id[]">
-        <tp:docstring>
-          <p>The list of track ids for which metadata is requested.</p>
-        </tp:docstring>
-      </arg>
-      <arg direction="out" type="aa{sv}" tp:type="Metadata_Map[]" name="Metadata">
-        <tp:docstring>
-          <p>Metadata of the set of tracks given as input.</p>
-        </tp:docstring>
-      </arg>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Gets all the metadata available for a set of tracks.</p>
-        <p>
-          Each set of metadata must have a "trackid" entry at the very least,
-          which contains a string that uniquely identifies this track within
-          the scope of the tracklist.
-        </p>
-      </tp:docstring>
-    </method>
-
-    <method name="AddTrack" tp:name-for-bindings="Add_Track">
-      <arg direction="in" type="s" tp:type="Uri" name="Uri">
-        <tp:docstring>
-          <p>
-            The uri of the item to add. Its uri scheme should be an element of the
-            <strong>org.mpris.MediaPlayer2.SupportedUriSchemes</strong>
-            property and the mime-type should match one of the elements of the
-            <strong>org.mpris.MediaPlayer2.SupportedMimeTypes</strong>
-          </p>
-        </tp:docstring>
-      </arg>
-      <arg direction="in" type="o" tp:type="Track_Id" name="AfterTrack">
-        <tp:docstring>
-          <p>
-            The identifier of the track after which
-            the new item should be inserted. An empty
-            string means at the begining of the track list.
-          </p>
-        </tp:docstring>
-      </arg>
-      <arg direction="in" type="b" name="SetAsCurrent">
-        <tp:docstring>
-          <p>
-            Whether the newly inserted track should be considered as
-            the current track. Setting this to trye has the same effect as
-            calling GoTo afterwards.
-          </p>
-        </tp:docstring>
-      </arg>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Adds a URI in the TrackList.</p>
-        <p>
-          If the <tp:member-ref>CanEditTracks</tp:member-ref> property is false,
-          this has no effect.
-        </p>
-        <p>
-          Note: Clients should not assume that the track has been added at the
-          time when this method returns. They should wait for a TrackAdded (or
-          TrackListReplaced) signal.
-        </p>
-      </tp:docstring>
-    </method>
-
-    <method name="RemoveTrack" tp:name-for-bindings="Remove__Track">
-      <arg direction="in" type="o" tp:type="Track_Id" name="TrackId">
-        <tp:docstring>
-          <p>Identifier of the track to be removed.</p>
-        </tp:docstring>
-      </arg>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Removes an item from the TrackList.</p>
-        <p>If the track is not part of this tracklist, this has no effect.</p>
-        <p>
-          If the <tp:member-ref>CanEditTracks</tp:member-ref> property is false,
-          this has no effect.
-        </p>
-        <p>
-          Note: Clients should not assume that the track has been removed at the
-          time when this method returns. They should wait for a TrackRemoved (or
-          TrackListReplaced) signal.
-        </p>
-      </tp:docstring>
-    </method>
-
-    <method name="GoTo" tp:name-for-bindings="Go_To">
-      <arg direction="in" type="o" tp:type="Track_Id" name="TrackId">
-        <tp:docstring>
-          <p>Identifier of the track to skip to.</p>
-        </tp:docstring>
-      </arg>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Skip to the specified TrackId.</p>
-        <p>If the track is not part of this tracklist, this has no effect.</p>
-        <p>
-          If this object is not <strong>/org/mpris/MediaPlayer2</strong>,
-          the current TrackList's tracks should be replaced with the contents of
-          this TrackList, and the TrackListReplaced signal should be fired from
-          <strong>/org/mpris/MediaPlayer2</strong>.
-        </p>
-      </tp:docstring>
-    </method>
-
-    <property name="Tracks" type="ao" tp:type="Track_Id[]" tp:name-for-bindings="Tracks" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="invalidates"/>
-      <tp:docstring>
-        <p>
-          An array which contains the identifier of each track
-          in the tracklist, in order.
-        </p>
-        <p>
-          The <literal>org.freedesktop.DBus.Properties.PropertiesChanged</literal>
-          signal is emited every time this property changes, but the signal
-          message does not contain the new value.
-
-          Client implementations should rather rely on the
-          <tp:member-ref>TrackAdded</tp:member-ref>,
-          <tp:member-ref>TrackRemoved</tp:member-ref> and
-          <tp:member-ref>TrackListReplaced</tp:member-ref> signals to keep their
-          representation of the tracklist up to date.
-        </p>
-      </tp:docstring>
-    </property>
-
-    <property name="CanEditTracks" type="b" tp:name-for-bindings="Can_Edit_Tracks" access="read">
-      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>
-          If <strong>false</strong>, calling
-          <tp:member-ref>AddTrack</tp:member-ref> or
-          <tp:member-ref>RemoveTrack</tp:member-ref> will have no effect,
-          and may raise a NotSupported error.
-        </p>
-        <p>
-          Every time this property changes, the
-          <literal>org.freedesktop.DBus.Properties.PropertiesChanged</literal>
-          signal is emited.
-        </p>
-      </tp:docstring>
-    </property>
-
-    <signal name="TrackListReplaced" tp:name-for-bindings="Track_List_Replaced">
-      <arg name="Tracks" type="ao" tp:type="Track_Id[]">
-        <tp:docstring>
-          <p>The new content of the tracklist.</p>
-        </tp:docstring>
-      </arg>
-      <arg name="CurrentTrack" type="o" tp:type="Track_Id">
-        <tp:docstring>
-          <p>The identifier of the track to be considered as current.</p>
-        </tp:docstring>
-      </arg>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Indicates that the entire tracklist has been replaced.</p>
-        <p>
-          It is left up to the implementation to decide when
-          a change to the track list is invasive enough that
-          this signal should be emitted instead of a series of
-          TrackAdded and TrackRemoved signals.
-        </p>
-      </tp:docstring>
-    </signal>
-
-    <signal name="TrackAdded" tp:name-for-bindings="Track_Added">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QVariantMap"/>
-      <arg type="a{sv}" tp:type="Metadata_Map" name="Metadata">
-        <tp:docstring>
-          <p>The metadata of the newly added item.</p>
-          <p>This must include a trackid entry.</p>
-        </tp:docstring>
-      </arg>
-      <arg type="o" tp:type="Track_Id" name="AfterTrack">
-        <tp:docstring>
-          <p>
-            The identifier of the track after which the new track
-            was inserted. An empty string means at the begining of
-            the tracklist.
-          </p>
-        </tp:docstring>
-      </arg>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Indicates that a track has been added to the track list.</p>
-      </tp:docstring>
-    </signal>
-
-    <signal name="TrackRemoved" tp:name-for-bindings="Track_Removed">
-      <arg type="o" tp:type="Track_Id" name="TrackId">
-        <tp:docstring>
-          <p>The identifier of the track being removed.</p>
-        </tp:docstring>
-      </arg>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Indicates that a track has been removed from the track list.</p>
-      </tp:docstring>
-    </signal>
-
-    <signal name="TrackMetadataChanged" tp:name-for-bindings="Track_Metadata_Changed">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QVariantMap"/>
-      <arg type="o" tp:type="Track_Id" name="TrackId">
-        <tp:docstring>
-          <p>The id of the track which metadata has changed.</p>
-        </tp:docstring>
-      </arg>
-      <arg type="a{sv}" tp:type="Metadata_Map" name="Metadata">
-        <tp:docstring>
-          <p>The new track metadata.</p>
-        </tp:docstring>
-      </arg>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>
-          Indicates that the metadata of a track in the tracklist has changed.
-        </p>
-        <p>
-          This may indicate that a track has been replaced, in which case the
-          trackid metadata entry is different from the TrackId argument.
-        </p>
-      </tp:docstring>
-    </signal>
-
-  </interface>
-</node>
-<!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/dbus/2.0/generate.sh b/dbus/2.0/generate.sh
deleted file mode 100755
index 8141ece..0000000
--- a/dbus/2.0/generate.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# Generates the QtDBus helper classes
-
-
-if [ "x$1" == "x--adaptors" ]; then
-	qdbusxml2cpp -N -c Mpris2RootAdaptor \
-		     -a root_adaptor Root_Node.xml
-	qdbusxml2cpp -N -c Mpris2PlayerAdaptor \
-		     -a player_adaptor Player_Node.xml
-	qdbusxml2cpp -N -c Mpris2TrackListAdaptor \
-		     -a tracklist_adaptor TrackList_Node.xml
-else
-	qdbusxml2cpp -N -c Mpris2RootProxy \
-		     -p root_proxy Root_Node.xml
-	qdbusxml2cpp -N -c Mpris2PlayerProxy \
-		     -p player_proxy Player_Node.xml
-	qdbusxml2cpp -N -c Mpris2TrackListProxy \
-		     -p tracklist_proxy TrackList_Node.xml
-fi
diff --git a/dbus/2.0/player_proxy.cpp b/dbus/2.0/player_proxy.cpp
deleted file mode 100644
index 6292cb3..0000000
--- a/dbus/2.0/player_proxy.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -N -c Mpris2PlayerProxy -p player_proxy Player_Node.xml
- *
- * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * This file may have been hand-edited. Look for HAND-EDIT comments
- * before re-generating it.
- */
-
-#include "player_proxy.h"
-
-/*
- * Implementation of interface class Mpris2PlayerProxy
- */
-
-Mpris2PlayerProxy::Mpris2PlayerProxy(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-Mpris2PlayerProxy::~Mpris2PlayerProxy()
-{
-}
-
diff --git a/dbus/2.0/player_proxy.h b/dbus/2.0/player_proxy.h
deleted file mode 100644
index b4bdae3..0000000
--- a/dbus/2.0/player_proxy.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -N -c Mpris2PlayerProxy -p player_proxy Player_Node.xml
- *
- * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef PLAYER_PROXY_H_1281721270
-#define PLAYER_PROXY_H_1281721270
-
-#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.mpris.MediaPlayer2.Player
- */
-class Mpris2PlayerProxy: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.mpris.MediaPlayer2.Player"; }
-
-public:
-    Mpris2PlayerProxy(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-
-    ~Mpris2PlayerProxy();
-
-    Q_PROPERTY(bool CanControl READ canControl)
-    inline bool canControl() const
-    { return qvariant_cast< bool >(property("CanControl")); }
-
-    Q_PROPERTY(bool CanGoNext READ canGoNext)
-    inline bool canGoNext() const
-    { return qvariant_cast< bool >(property("CanGoNext")); }
-
-    Q_PROPERTY(bool CanGoPrevious READ canGoPrevious)
-    inline bool canGoPrevious() const
-    { return qvariant_cast< bool >(property("CanGoPrevious")); }
-
-    Q_PROPERTY(bool CanPause READ canPause)
-    inline bool canPause() const
-    { return qvariant_cast< bool >(property("CanPause")); }
-
-    Q_PROPERTY(bool CanPlay READ canPlay)
-    inline bool canPlay() const
-    { return qvariant_cast< bool >(property("CanPlay")); }
-
-    Q_PROPERTY(bool CanSeek READ canSeek)
-    inline bool canSeek() const
-    { return qvariant_cast< bool >(property("CanSeek")); }
-
-    Q_PROPERTY(QString LoopStatus READ loopStatus WRITE setLoopStatus)
-    inline QString loopStatus() const
-    { return qvariant_cast< QString >(property("LoopStatus")); }
-    inline void setLoopStatus(const QString &value)
-    { setProperty("LoopStatus", qVariantFromValue(value)); }
-
-    Q_PROPERTY(double MaximumRate READ maximumRate)
-    inline double maximumRate() const
-    { return qvariant_cast< double >(property("MaximumRate")); }
-
-    Q_PROPERTY(QVariantMap Metadata READ metadata)
-    inline QVariantMap metadata() const
-    { return qvariant_cast< QVariantMap >(property("Metadata")); }
-
-    Q_PROPERTY(double MinimumRate READ minimumRate)
-    inline double minimumRate() const
-    { return qvariant_cast< double >(property("MinimumRate")); }
-
-    Q_PROPERTY(QString PlaybackStatus READ playbackStatus)
-    inline QString playbackStatus() const
-    { return qvariant_cast< QString >(property("PlaybackStatus")); }
-
-    Q_PROPERTY(qlonglong Position READ position)
-    inline qlonglong position() const
-    { return qvariant_cast< qlonglong >(property("Position")); }
-
-    Q_PROPERTY(double Rate READ rate WRITE setRate)
-    inline double rate() const
-    { return qvariant_cast< double >(property("Rate")); }
-    inline void setRate(double value)
-    { setProperty("Rate", qVariantFromValue(value)); }
-
-    Q_PROPERTY(bool Shuffle READ shuffle WRITE setShuffle)
-    inline bool shuffle() const
-    { return qvariant_cast< bool >(property("Shuffle")); }
-    inline void setShuffle(bool value)
-    { setProperty("Shuffle", qVariantFromValue(value)); }
-
-    Q_PROPERTY(double Volume READ volume WRITE setVolume)
-    inline double volume() const
-    { return qvariant_cast< double >(property("Volume")); }
-    inline void setVolume(double value)
-    { setProperty("Volume", qVariantFromValue(value)); }
-
-public Q_SLOTS: // METHODS
-    inline QDBusPendingReply<> Next()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("Next"), argumentList);
-    }
-
-    inline QDBusPendingReply<> OpenUri(const QString &Uri)
-    {
-        QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(Uri);
-        return asyncCallWithArgumentList(QLatin1String("OpenUri"), argumentList);
-    }
-
-    inline QDBusPendingReply<> Pause()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("Pause"), argumentList);
-    }
-
-    inline QDBusPendingReply<> Play()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("Play"), argumentList);
-    }
-
-    inline QDBusPendingReply<> PlayPause()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("PlayPause"), argumentList);
-    }
-
-    inline QDBusPendingReply<> Previous()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("Previous"), argumentList);
-    }
-
-    inline QDBusPendingReply<> Seek(qlonglong Offset)
-    {
-        QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(Offset);
-        return asyncCallWithArgumentList(QLatin1String("Seek"), argumentList);
-    }
-
-    inline QDBusPendingReply<> SetPosition(const QDBusObjectPath &TrackId, qlonglong Position)
-    {
-        QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(TrackId) << qVariantFromValue(Position);
-        return asyncCallWithArgumentList(QLatin1String("SetPosition"), argumentList);
-    }
-
-    inline QDBusPendingReply<> Stop()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("Stop"), argumentList);
-    }
-
-Q_SIGNALS: // SIGNALS
-    void Seeked(qlonglong Position);
-};
-
-#endif
diff --git a/dbus/2.0/qtdbus-annotations.patch b/dbus/2.0/qtdbus-annotations.patch
deleted file mode 100644
index f454bd9..0000000
--- a/dbus/2.0/qtdbus-annotations.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -urw ../../../spec/spec/Player_Node.xml ./Player_Node.xml
---- ../../../spec/spec/Player_Node.xml	2010-08-13 14:20:50.000000000 +0100
-+++ ./Player_Node.xml	2010-08-13 18:31:13.000000000 +0100
-@@ -408,6 +408,7 @@
- 
-     <property name="Metadata" tp:name-for-bindings="Metadata" type="a{sv}" tp:type="Metadata_Map" access="read">
-       <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/>
-+      <annotation name="com.trolltech.QtDBus.QtTypeName" value="QVariantMap"/>
-       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-         <p>The metadata of the current element.</p>
-         <p>
-diff -urw ../../../spec/spec/TrackList_Node.xml ./TrackList_Node.xml
---- ../../../spec/spec/TrackList_Node.xml	2010-08-13 13:57:32.000000000 +0100
-+++ ./TrackList_Node.xml	2010-08-13 18:32:13.000000000 +0100
-@@ -70,6 +70,7 @@
-     </tp:simple-type>
- 
-     <method name="GetTracksMetadata" tp:name-for-bindings="Get_Tracks_Metadata">
-+      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
-       <arg direction="in" name="TrackIds" type="ao" tp:type="Track_Id[]">
-         <tp:docstring>
-           <p>The list of track ids for which metadata is requested.</p>
-@@ -233,6 +234,7 @@
-     </signal>
- 
-     <signal name="TrackAdded" tp:name-for-bindings="Track_Added">
-+      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QVariantMap"/>
-       <arg type="a{sv}" tp:type="Metadata_Map" name="Metadata">
-         <tp:docstring>
-           <p>The metadata of the newly added item.</p>
-@@ -265,6 +267,7 @@
-     </signal>
- 
-     <signal name="TrackMetadataChanged" tp:name-for-bindings="Track_Metadata_Changed">
-+      <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QVariantMap"/>
-       <arg type="o" tp:type="Track_Id" name="TrackId">
-         <tp:docstring>
-           <p>The id of the track which metadata has changed.</p>
diff --git a/dbus/2.0/root_proxy.cpp b/dbus/2.0/root_proxy.cpp
deleted file mode 100644
index 0b236a8..0000000
--- a/dbus/2.0/root_proxy.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -N -c Mpris2RootProxy -p root_proxy Root_Node.xml
- *
- * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * This file may have been hand-edited. Look for HAND-EDIT comments
- * before re-generating it.
- */
-
-#include "root_proxy.h"
-
-/*
- * Implementation of interface class Mpris2RootProxy
- */
-
-Mpris2RootProxy::Mpris2RootProxy(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-Mpris2RootProxy::~Mpris2RootProxy()
-{
-}
-
diff --git a/dbus/2.0/root_proxy.h b/dbus/2.0/root_proxy.h
deleted file mode 100644
index be6aa99..0000000
--- a/dbus/2.0/root_proxy.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -N -c Mpris2RootProxy -p root_proxy Root_Node.xml
- *
- * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef ROOT_PROXY_H_1281721270
-#define ROOT_PROXY_H_1281721270
-
-#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.mpris.MediaPlayer2
- */
-class Mpris2RootProxy: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.mpris.MediaPlayer2"; }
-
-public:
-    Mpris2RootProxy(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-
-    ~Mpris2RootProxy();
-
-    Q_PROPERTY(bool CanQuit READ canQuit)
-    inline bool canQuit() const
-    { return qvariant_cast< bool >(property("CanQuit")); }
-
-    Q_PROPERTY(bool CanRaise READ canRaise)
-    inline bool canRaise() const
-    { return qvariant_cast< bool >(property("CanRaise")); }
-
-    Q_PROPERTY(QString DesktopEntry READ desktopEntry)
-    inline QString desktopEntry() const
-    { return qvariant_cast< QString >(property("DesktopEntry")); }
-
-    Q_PROPERTY(bool HasTrackList READ hasTrackList)
-    inline bool hasTrackList() const
-    { return qvariant_cast< bool >(property("HasTrackList")); }
-
-    Q_PROPERTY(QString Identity READ identity)
-    inline QString identity() const
-    { return qvariant_cast< QString >(property("Identity")); }
-
-    Q_PROPERTY(QStringList SupportedMimeTypes READ supportedMimeTypes)
-    inline QStringList supportedMimeTypes() const
-    { return qvariant_cast< QStringList >(property("SupportedMimeTypes")); }
-
-    Q_PROPERTY(QStringList SupportedUriSchemes READ supportedUriSchemes)
-    inline QStringList supportedUriSchemes() const
-    { return qvariant_cast< QStringList >(property("SupportedUriSchemes")); }
-
-public Q_SLOTS: // METHODS
-    inline QDBusPendingReply<> Quit()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("Quit"), argumentList);
-    }
-
-    inline QDBusPendingReply<> Raise()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("Raise"), argumentList);
-    }
-
-Q_SIGNALS: // SIGNALS
-};
-
-#endif
diff --git a/dbus/2.0/tracklist_proxy.cpp b/dbus/2.0/tracklist_proxy.cpp
deleted file mode 100644
index 72c5915..0000000
--- a/dbus/2.0/tracklist_proxy.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -N -c Mpris2TrackListProxy -p tracklist_proxy TrackList_Node.xml
- *
- * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * This file may have been hand-edited. Look for HAND-EDIT comments
- * before re-generating it.
- */
-
-#include "tracklist_proxy.h"
-
-/*
- * Implementation of interface class Mpris2TrackListProxy
- */
-
-Mpris2TrackListProxy::Mpris2TrackListProxy(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-Mpris2TrackListProxy::~Mpris2TrackListProxy()
-{
-}
-
diff --git a/dbus/2.0/tracklist_proxy.h b/dbus/2.0/tracklist_proxy.h
deleted file mode 100644
index 045b67a..0000000
--- a/dbus/2.0/tracklist_proxy.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -N -c Mpris2TrackListProxy -p tracklist_proxy TrackList_Node.xml
- *
- * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#ifndef TRACKLIST_PROXY_H_1281721270
-#define TRACKLIST_PROXY_H_1281721270
-
-#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.mpris.MediaPlayer2.TrackList
- */
-class Mpris2TrackListProxy: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.mpris.MediaPlayer2.TrackList"; }
-
-public:
-    Mpris2TrackListProxy(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-
-    ~Mpris2TrackListProxy();
-
-    Q_PROPERTY(bool CanEditTracks READ canEditTracks)
-    inline bool canEditTracks() const
-    { return qvariant_cast< bool >(property("CanEditTracks")); }
-
-    Q_PROPERTY(QList<QDBusObjectPath> Tracks READ tracks)
-    inline QList<QDBusObjectPath> tracks() const
-    { return qvariant_cast< QList<QDBusObjectPath> >(property("Tracks")); }
-
-public Q_SLOTS: // METHODS
-    inline QDBusPendingReply<> AddTrack(const QString &Uri, const QDBusObjectPath &AfterTrack, bool SetAsCurrent)
-    {
-        QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(Uri) << qVariantFromValue(AfterTrack) << qVariantFromValue(SetAsCurrent);
-        return asyncCallWithArgumentList(QLatin1String("AddTrack"), argumentList);
-    }
-
-    inline QDBusPendingReply<QVariantMap> GetTracksMetadata(const QList<QDBusObjectPath> &TrackIds)
-    {
-        QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(TrackIds);
-        return asyncCallWithArgumentList(QLatin1String("GetTracksMetadata"), argumentList);
-    }
-
-    inline QDBusPendingReply<> GoTo(const QDBusObjectPath &TrackId)
-    {
-        QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(TrackId);
-        return asyncCallWithArgumentList(QLatin1String("GoTo"), argumentList);
-    }
-
-    inline QDBusPendingReply<> RemoveTrack(const QDBusObjectPath &TrackId)
-    {
-        QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(TrackId);
-        return asyncCallWithArgumentList(QLatin1String("RemoveTrack"), argumentList);
-    }
-
-Q_SIGNALS: // SIGNALS
-    void TrackAdded(const QVariantMap &Metadata, const QDBusObjectPath &AfterTrack);
-    void TrackListReplaced(const QList<QDBusObjectPath> &Tracks, const QDBusObjectPath &CurrentTrack);
-    void TrackMetadataChanged(const QDBusObjectPath &TrackId, const QVariantMap &Metadata);
-    void TrackRemoved(const QDBusObjectPath &TrackId);
-};
-
-#endif
author	Alex Merry <dev@randomguy3.me.uk>	2011-10-28 14:26:27 +0200
committer	Alex Merry <dev@randomguy3.me.uk>	2011-10-28 14:26:27 +0200
commit	e49663a4e8a948186163216570265e7b288de286 (patch)
tree	0bac6f6c8c63f21026bc3f5d3df2506a468269c6
parent	8d241d7fdb1ede91fbc144d90c8ce2eacff06d71 (diff)