From: Robert Tari Date: Wed, 27 Nov 2024 10:21:59 +0100 Subject: Allow building with embedded MPRIS support Forwarded: https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/merge_requests/45 --- CMakeLists.txt | 7 +++ src/CMakeLists.txt | 5 ++ src/mediaplayer.cpp | 27 ++++++++++ src/qml/player/AbstractPlayer.qml | 10 ++++ src/qml/player/MprisService.qml | 88 +++++++++++++++++++++++++++++++ 5 files changed, 137 insertions(+) create mode 100644 src/qml/player/MprisService.qml --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,9 @@ project(lomiri-mediaplayer-app VERSION 1.1.1 LANGUAGES CXX) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) +# Options +option (ADD_MPRIS "Enable the player's own MPRIS integration" OFF) + # Find includes in corresponding build directories set(CMAKE_INCLUDE_CURRENT_DIR ON) set(DESKTOP_FILE lomiri-mediaplayer-app.desktop) @@ -31,6 +34,10 @@ endif() find_package(Qt5 COMPONENTS Gui Widgets Core Qml Quick Multimedia REQUIRED) +if (ADD_MPRIS) + find_package (Qt5 COMPONENTS DBus REQUIRED) +endif () + # Standard install paths include(GNUInstallDirs) --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -22,6 +22,11 @@ Qt5::Quick ) +if (ADD_MPRIS) + target_link_libraries (${MEDIAPLAYER} Qt5::DBus) + target_compile_definitions (${MEDIAPLAYER} PUBLIC ADD_MPRIS) +endif () + install(TARGETS ${MEDIAPLAYER} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) --- a/src/mediaplayer.cpp +++ b/src/mediaplayer.cpp @@ -30,6 +30,11 @@ #include #include +#ifdef ADD_MPRIS + #include + #include +#endif + static void printUsage(const QStringList& arguments) { qDebug() << "usage:" @@ -97,6 +102,28 @@ m_view->rootContext()->setContextProperty("screenWidth", m_view->size().width()); m_view->rootContext()->setContextProperty("screenHeight", m_view->size().height()); + bool bMpris = false; + + #ifdef ADD_MPRIS + QDBusConnection cConnection = QDBusConnection::sessionBus (); + QDBusConnectionInterface *pInterface = cConnection.interface (); + bMpris = !pInterface->isServiceRegistered ("com.lomiri.MediaHub.Service"); + QString sPath = mediaPlayerDirectory (); + bool bInstalled = isRunningInstalled (); + + if (bInstalled == false) + { + QDir pDir (sPath); + sPath = pDir.absoluteFilePath ("../data"); + sPath = pDir.cleanPath (sPath); + } + + sPath += "/lomiri-mediaplayer-app.png"; + this->m_view->rootContext ()->setContextProperty ("APP_ICON", QVariant (sPath)); + #endif + + this->m_view->rootContext ()->setContextProperty ("ADD_MPRIS", QVariant (bMpris)); + connect(m_view, SIGNAL(widthChanged(int)), SLOT(onWidthChanged(int))); connect(m_view, SIGNAL(heightChanged(int)), SLOT(onHeightChanged(int))); connect(m_view->engine(), SIGNAL(quit()), SLOT(quit())); --- a/src/qml/player/AbstractPlayer.qml +++ b/src/qml/player/AbstractPlayer.qml @@ -212,4 +212,14 @@ PropertyAction { target: scrubbingTimer; property: "step"; value: -forwardSeekStep } } ] + + Loader { + source: ADD_MPRIS ? "MprisService.qml" : "" + + onStatusChanged: { + if (status == Loader.Ready && item) { + item.player = player; + } + } + } } --- /dev/null +++ b/src/qml/player/MprisService.qml @@ -0,0 +1,88 @@ +import QtQuick 2.4 +import QtMultimedia 5.6 +import org.nemomobile.mpris 1.0 + +Item +{ + property var player: null + + MprisPlayer + { + serviceName: "lomiri-mediaplayer-app" + supportedUriSchemes: ["file"] + canQuit: false + canRaise: false + canSetFullscreen: false + hasTrackList: false + desktopEntry: "lomiri-mediaplayer-app" + identity: "Lomiri Media Player App" + canControl: player && player.video && player.video.source != "" + canPlay: true + canGoNext: false + canGoPrevious: false + canPause: true + canSeek: false + playbackStatus: ((!player || !player.video) ? Mpris.Stopped : player.video.playbackState == MediaPlayer.PlayingState ? Mpris.Playing : player.video.playbackState == MediaPlayer.PausedState ? Mpris.Paused : Mpris.Stopped) + metadata: + { + let pMetadata = {}; + + if (player && player.video && player.video.metaData) + { + if (player.video.metaData.author != null) + { + pMetadata["xesam:artist"] = [player.video.metaData.author]; + } + + if (player.video.metaData.title != null) + { + pMetadata["xesam:title"] = player.video.metaData.title; + } + + if (player.video.metaData.albumTitle != null) + { + pMetadata["xesam:album"] = player.video.metaData.albumTitle; + } + + if (player.video.metaData.coverArtUrlSmall != null) + { + pMetadata["mpris:artUrl"] = player.video.metaData.coverArtUrlSmall; + } + else if (player.video.metaData.coverArtUrlLarge != null) + { + pMetadata["mpris:artUrl"] = player.video.metaData.coverArtUrlLarge; + } + else if (player.video.metaData.posterUrl != null) + { + pMetadata["mpris:artUrl"] = player.video.metaData.posterUrl; + } + else + { + pMetadata["mpris:artUrl"] = APP_ICON; + } + } + + return pMetadata; + } + + onPlayRequested: + { + player.video.play (); + } + + onPauseRequested: + { + player.video.pause (); + } + + onStopRequested: + { + player.video.stop (); + } + + onPlayPauseRequested: + { + player.togglePause (); + } + } +}