diff options
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/mediaplayer/libkvimediaplayer.cpp | 3 | ||||
| -rw-r--r-- | src/modules/mediaplayer/mp_mprisinterface.cpp | 19 | ||||
| -rw-r--r-- | src/modules/mediaplayer/mp_mprisinterface.h | 8 |
3 files changed, 29 insertions, 1 deletions
diff --git a/src/modules/mediaplayer/libkvimediaplayer.cpp b/src/modules/mediaplayer/libkvimediaplayer.cpp index df5aa8666..d16609c8e 100644 --- a/src/modules/mediaplayer/libkvimediaplayer.cpp +++ b/src/modules/mediaplayer/libkvimediaplayer.cpp @@ -1617,6 +1617,9 @@ static bool mediaplayer_module_init( KviModule * m ) g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviBmpxInterface)); g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviAmarok2Interface)); g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviQmmpInterface)); + g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviSongbirdInterface)); + g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviTotemInterface)); + g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviVlcInterface)); #endif #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) diff --git a/src/modules/mediaplayer/mp_mprisinterface.cpp b/src/modules/mediaplayer/mp_mprisinterface.cpp index d3e1f19d1..fa34c78a8 100644 --- a/src/modules/mediaplayer/mp_mprisinterface.cpp +++ b/src/modules/mediaplayer/mp_mprisinterface.cpp @@ -557,4 +557,23 @@ KviTotemInterface::KviTotemInterface() m_szServiceName = "org.mpris.Totem"; } +/* Vlc interface */ +MP_IMPLEMENT_DESCRIPTOR( + KviVlcInterface, + "vlc", + __tr2qs_ctx( + "An interface to Vlc.\n" \ + "Download it from http://www.videolan.org/\n" \ + "You need to manually enable the DBus control\n" \ + "interface in the Vlc preferences\n" \ + , + "mediaplayer" + ) +) + +KviVlcInterface::KviVlcInterface() +: KviMPRISInterface() +{ + m_szServiceName = "org.mpris.vlc"; +} #endif //COMPILE_ON_WINDOWS diff --git a/src/modules/mediaplayer/mp_mprisinterface.h b/src/modules/mediaplayer/mp_mprisinterface.h index 1ca89f221..f86af3b27 100644 --- a/src/modules/mediaplayer/mp_mprisinterface.h +++ b/src/modules/mediaplayer/mp_mprisinterface.h @@ -116,6 +116,12 @@ KviTotemInterface(); }; + class KviVlcInterface : public KviMPRISInterface + { + public: + KviVlcInterface(); + }; + MP_DECLARE_DESCRIPTOR(KviAudaciousInterface) MP_DECLARE_DESCRIPTOR(KviBmpxInterface) MP_DECLARE_DESCRIPTOR(KviAmarok2Interface) @@ -123,7 +129,7 @@ MP_DECLARE_DESCRIPTOR(KviXmms2Interface) MP_DECLARE_DESCRIPTOR(KviSongbirdInterface) MP_DECLARE_DESCRIPTOR(KviTotemInterface) - + MP_DECLARE_DESCRIPTOR(KviVlcInterface) #endif //COMPILE_ON_WINDOWS #endif //_MP_AUDACIOUSINTERFACE_H_ |