diff options
Diffstat (limited to 'src/plugins/General/mpris/mpris.cpp')
| -rw-r--r-- | src/plugins/General/mpris/mpris.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/plugins/General/mpris/mpris.cpp b/src/plugins/General/mpris/mpris.cpp index d355f7f7f..6e53d11d9 100644 --- a/src/plugins/General/mpris/mpris.cpp +++ b/src/plugins/General/mpris/mpris.cpp @@ -19,22 +19,25 @@ ***************************************************************************/ #include <QtDBus> -#include "playerobject.h" -#include "rootobject.h" -#include "tracklistobject.h" -#include "root2object.h" +#include "mpris1/playerobject.h" +#include "mpris1/rootobject.h" +#include "mpris1/tracklistobject.h" +#include "mpris2/root2object.h" +#include "mpris2/player2object.h" #include "mpris.h" MPRIS::MPRIS(QObject *parent) : General(parent) { QDBusConnection connection = QDBusConnection::sessionBus(); - //MPRISv1 + //MPRISv1.0 connection.registerObject("/TrackList", new TrackListObject(this), QDBusConnection::ExportAllContents); connection.registerObject("/Player", new PlayerObject(this), QDBusConnection::ExportAllContents); connection.registerObject("/", new RootObject(this), QDBusConnection::ExportAllContents); - //MPRISv2 + //MPRISv2.0 connection.registerObject("/org/mpris/MediaPlayer2", new Root2Object(this), QDBusConnection::ExportAllContents); + connection.registerObject("/org/mpris/MediaPlayer2/Player", new Player2Object(this), + QDBusConnection::ExportAllContents); connection.registerService("org.mpris.qmmp"); connection.registerService("org.mpris.MediaPlayer2.qmmp"); } |
