aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/General/mpris/mpris.cpp
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2010-12-04 10:07:04 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2010-12-04 10:07:04 +0000
commit07e1d5d6dcc5c9f9e345e948267c3612e8fa87e0 (patch)
tree079e12df0272c5089788ecd8abbeba90f0189a2d /src/plugins/General/mpris/mpris.cpp
parent99de210652e05815c0bd9b15c9d64a51a3ff4d97 (diff)
downloadqmmp-07e1d5d6dcc5c9f9e345e948267c3612e8fa87e0.tar.gz
qmmp-07e1d5d6dcc5c9f9e345e948267c3612e8fa87e0.tar.bz2
qmmp-07e1d5d6dcc5c9f9e345e948267c3612e8fa87e0.zip
fixed build
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1995 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/General/mpris/mpris.cpp')
-rw-r--r--src/plugins/General/mpris/mpris.cpp15
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");
}