diff options
| author |  Tomasz Moń | 2009-09-25 15:06:14 +0000 |
|---|---|---|
| committer | Tomasz Moń | 2009-09-25 15:06:14 +0000 |
| commit | 7a977b316bd81669bcd99ac8eb7e197840dd7fc0 (patch) | |
| tree | a2bc3acbff5a5db58201ba0d35efb3d14467685a /src/modules/mediaplayer/mp_mprisinterface.cpp | |
| parent | more fixes to pytho module. now it is able to correctly run python code :) (diff) | |
| download | KVIrc-7a977b316bd81669bcd99ac8eb7e197840dd7fc0.tar.gz KVIrc-7a977b316bd81669bcd99ac8eb7e197840dd7fc0.tar.bz2 KVIrc-7a977b316bd81669bcd99ac8eb7e197840dd7fc0.zip | |
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
Diffstat (limited to 'src/modules/mediaplayer/mp_mprisinterface.cpp')
| -rw-r--r-- | src/modules/mediaplayer/mp_mprisinterface.cpp | 22 |
1 files changed, 22 insertions, 0 deletions
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 |