2 files changed, 19 insertions, 14 deletions
diff --git a/src/plugins/General/mpris/CMakeLists.txt b/src/plugins/General/mpris/CMakeLists.txt
index d1eb3e2a3..f2c9f6d5d 100644
--- a/src/plugins/General/mpris/CMakeLists.txt
+++ b/src/plugins/General/mpris/CMakeLists.txt
@@ -32,19 +32,21 @@ link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
 SET(libmpris_SRCS
     mpris.cpp
     mprisfactory.cpp
-    rootobject.cpp
-    root2object.cpp
-    playerobject.cpp
-    tracklistobject.cpp
+    mpris1/rootobject.cpp
+    mpris1/playerobject.cpp
+    mpris1/tracklistobject.cpp
+    mpris2/root2object.cpp
+    mpris2/player2object.cpp
 )
 
 SET(libmpris_MOC_HDRS
     mprisfactory.h
     mpris.h
-    rootobject.h
-    root2object.h
-    playerobject.h
-    tracklistobject.h
+    mpris1/rootobject.h
+    mpris1/playerobject.h
+    mpris1/tracklistobject.h
+    mpris2/root2object.h
+    mpris2/player2object.cpp
 )
 
 SET(libmpris_RCCS translations/translations.qrc)
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");
 }