From 7a977b316bd81669bcd99ac8eb7e197840dd7fc0 Mon Sep 17 00:00:00 2001
From: Tomasz Moń
Date: Fri, 25 Sep 2009 15:06:14 +0000
Subject: Merge xmms2interface into mp_mprisinterface as it's simply an
 inheritance of KviMPRISInterface

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3526 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/modules/mediaplayer/mp_mprisinterface.cpp | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'src/modules/mediaplayer/mp_mprisinterface.cpp')

diff --git a/src/modules/mediaplayer/mp_mprisinterface.cpp b/src/modules/mediaplayer/mp_mprisinterface.cpp
index a4447bf62..08c9c0b1c 100644
--- a/src/modules/mediaplayer/mp_mprisinterface.cpp
+++ b/src/modules/mediaplayer/mp_mprisinterface.cpp
@@ -396,6 +396,11 @@ KviMediaPlayerInterface::PlayerStatus KviAudaciousInterface::status()
 
 int KviAudaciousInterface::length()
 {
+	int length = KviMPRISInterface::length();
+	if (length != -1)
+		return length;
+
+	/* compability with older versions */
 	MPRIS_CALL_METHOD("GetMetadata", -1)
 
 	foreach (QVariant v, reply.arguments()) {
@@ -493,4 +498,21 @@ KviQmmpInterface::KviQmmpInterface()
         m_szServiceName = "org.mpris.qmmp";
 }
 
+/* xmms2 interface */
+MP_IMPLEMENT_DESCRIPTOR(
+	KviXmms2Interface,
+	"xmms2",
+	__tr2qs_ctx(
+		"An interface to the xmms2 media player.\n" \
+		"Download it from http://wiki.xmms2.xmms.se/index.php/Main_Page\n",
+		"mediaplayer"
+	)
+)
+
+KviXmms2Interface::KviXmms2Interface()
+: KviMPRISInterface()
+{
+	m_szServiceName = "org.mpris.xmms2";
+}
+
 #endif //!COMPILE_ON_WINDOWS
-- 
cgit v1.3.1-10-gc9f91